Merge branch 'master' of github.com:sharelatex/web-sharelatex

# Conflicts:
#	app/coffee/Features/Notifications/NotificationsBuilder.coffee

services/web/app/coffee/Features/Compile/CompileController.coffee

@@ -151,9 +151,9 @@ module.exports = CompileController =
 		{page, h, v} = req.query
 		if not page?.match(/^\d+$/)
 			return next(new Error("invalid page parameter"))
-		if not h?.match(/^\d+\.\d+$/)
+		if not h?.match(/^-?\d+\.\d+$/)
 			return next(new Error("invalid h parameter"))
-		if not v?.match(/^\d+\.\d+$/)
+		if not v?.match(/^-?\d+\.\d+$/)
 			return next(new Error("invalid v parameter"))
 		# whether this request is going to a per-user container
 		CompileController._compileAsUser req, (error, user_id) ->

services/web/app/coffee/Features/Notifications/NotificationsBuilder.coffee

@@ -11,7 +11,7 @@ module.exports =
 			messageOpts =
 				groupName: licence.name
 				subscription_id: licence.subscription_id
-			logger.log user_id:user._id, key: @key, "creating notification key for user"
+			logger.log user_id:user._id, key:@key, "creating notification key for user"
 			NotificationsHandler.createNotification user._id, @key, "notification_group_invite", messageOpts, null, callback
 
 		read: (callback = ->)->