Add a skeleton of a callback endpoint for merging accounts via email

services/web/app/coffee/Features/AccountMerge/AccountMergeEmailController.coffee

@@ -0,0 +1,5 @@
+
+module.exports = AccountMergeEmailController =
+
+	confirmMergeFromEmail: (req, res, next) ->
+		return res.render('account_merge/finish', {})

services/web/app/coffee/router.coffee

@@ -50,6 +50,7 @@ TokenAccessController = require('./Features/TokenAccess/TokenAccessController')
 Features = require('./infrastructure/Features')
 LinkedFilesRouter = require './Features/LinkedFiles/LinkedFilesRouter'
 TemplatesRouter = require './Features/Templates/TemplatesRouter'
+AccountMergeEmailController = require './Features/AccountMerge/AccountMergeEmailController'
 
 logger = require("logger-sharelatex")
 _ = require("underscore")
@@ -68,6 +69,8 @@ module.exports = class Router
 		webRouter.get  '/logout', UserController.logout
 		webRouter.get  '/restricted', AuthorizationMiddlewear.restricted
 
+		webRouter.get '/account-merge/email/confirm', AccountMergeEmailController.confirmMergeFromEmail
+
 		if Features.hasFeature('registration')
 			webRouter.get '/register', UserPagesController.registerPage
 			AuthenticationController.addEndpointToLoginWhitelist '/register'

services/web/app/views/account_merge/finish.pug

@@ -0,0 +1,15 @@
+extends ../layout
+
+block content
+	.content.content-alt
+		.container
+			.row
+				.col-md-12.col-lg-10.col-lg-offset-1
+					.card
+						.page-header
+							h1 Account Merge Complete
+
+						div.container-fluid
+							.row
+								.col-md-12
+									p Test