Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

server/startup/migrations/v37.js

+RocketChat.Migrations.add({
+	version: 37,
+	up: function() {
+		if (RocketChat && RocketChat.models && RocketChat.models.Settings) {
+			var footer = RocketChat.models.Settings.findOne('Layout_Sidenav_Footer');
+
+			// Replace footer octicons with icons
+			if (footer !== '') {
+				footer = footer.replace('octicon octicon-pencil', 'icon-pencil');
+				footer = footer.replace('octicon octicon-heart', 'icon-heart');
+				footer = footer.replace('octicon octicon-mark-github', 'icon-github-circled');
+				RocketChat.models.Settings.update({ _id: 'Layout_Sidenav_Footer' }, { $set: { value: footer, packageValue: footer } });
+			}
+		}
+	}
+});