Merge branch 'master' into sk-references-ac

services/web/app/coffee/Features/Project/ProjectEntityHandler.coffee

@@ -111,7 +111,6 @@ module.exports = ProjectEntityHandler =
 		DocstoreManager.getDoc project_id, doc_id, options, callback
 
 	addDoc: (project_id, folder_id, docName, docLines, callback = (error, doc, folder_id) ->)=>
-		console.log project_id
 		ProjectGetter.getProjectWithOnlyFolders project_id, (err, project) ->
 			logger.log project: project._id, folder_id: folder_id, doc_name: docName, "adding doc"
 			return callback(err) if err?

services/web/app/views/subscriptions/new.jade

@@ -112,7 +112,6 @@ block content
 												.form-group(ng-class="validation.correctExpiry == false || validation.errorFields.year ? 'has-error' : ''")
 													select.form-control(data-recurly='year', ng-change="validateExpiry()", ng-model='data.year')
 														option(value="", disabled, selected) Year
-														option(value="2015") 2015
 														option(value="2016") 2016
 														option(value="2017") 2017
 														option(value="2018") 2018

services/web/app/views/subscriptions/successful_subscription.jade

@@ -5,7 +5,7 @@ block content
 		.container
 			.row
 				.col-md-8.col-md-offset-2
-					.card
+					.card(ng-cloak)
 						.page-header
 							h2 #{translate("thanks_for_subscribing")}
 						.alert.alert-success
@@ -15,8 +15,8 @@ block content
 									p #{translate("if_you_dont_want_to_be_charged")}
 										a(href="/user/subscription") #{translate("click_here_to_cancel")}.
 								span(sixpack-when="manage-subscription")
-									p #{translate("to_modify_your_subscription_go_to")}
-										a(href="/user/subscription") #{translate("manage_subscription")}.
+									p #{translate("to_modify_your_subscription_go_to")} 
+										a(href="/user/subscription")  #{translate("manage_subscription")}.
 						p
 							- if (subscription.groupPlan == true)
 								a.btn.btn-success.btn-large(href="/subscription/group") #{translate("add_your_first_group_member_now")}

services/web/config/settings.defaults.coffee

@@ -291,7 +291,7 @@ module.exports =
 		title: "ShareLaTeX Community Edition"
 		
 		left_footer: [{
-			text: "Powered by <a href='https://www.sharelatex.com'>ShareLaTeX</a> © 2015"
+			text: "Powered by <a href='https://www.sharelatex.com'>ShareLaTeX</a> © 2016"
 		}]
 
 		right_footer: [{

services/web/package.json

@@ -27,7 +27,7 @@
     "http-proxy": "^1.8.1",
     "jade": "~1.3.1",
     "ldapjs": "^0.7.1",
-    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.1.0",
+    "logger-sharelatex": "git+https://github.com/sharelatex/logger-sharelatex.git#v1.3.0",
     "lynx": "0.1.1",
     "marked": "^0.3.3",
     "method-override": "^2.3.3",