Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/language/en_GB/topic.json

@@ -37,6 +37,7 @@
 	"markAsUnreadForAll.success" : "Topic marked as unread for all.",
 
 	"watch": "Watch",
+	"watch.title": "Be notified of new replies in this topic",
 	"share_this_post": "Share this Post",
 
 	"thread_tools.title": "Thread Tools",

public/src/forum/admin/themes.js

@@ -11,7 +11,7 @@ define(['forum/admin/settings'], function(Settings) {
 
 	Themes.init = function() {
 		var scriptEl = $('<script />');
-		scriptEl.attr('src', 'http://api.bootswatch.com/3/?callback=bootswatchListener');
+		scriptEl.attr('src', '//api.bootswatch.com/3/?callback=bootswatchListener');
 		$('body').append(scriptEl);
 
 		var bootstrapThemeContainer = $('#bootstrap_themes'),