Update settings.jade
Update settingsCtrl.js
Update settingsCtrl.js
Update settings.jade
Update settings.jade
Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop

Conflicts:
	views/options/settings.jade