Merge remote-tracking branch 'refs/remotes/origin/master' into pr/1555

# Conflicts:
#	js/templates/appBar.html
#	js/views/settingsVw.js

Author: jjeffryes

js/views/settingsVw.js

@@ -1078,7 +1078,7 @@ module.exports = Backbone.View.extend({
   toggleFancyStyles: function(){
     var $html = $('html');
 
-    if($('#advancedForm').find('input[name="notFancy"]').prop('checked')){
+    if ($('#advancedForm').find('input[name="notFancy"]').prop('checked')){
       $html.addClass('notFancy');
       localStorage.setItem('notFancy', "true");
     } else {