No real changes
Merge remote-tracking branch 'origin/master'
Minor changes in settings, cleaning up some text stuff
Merge remote-tracking branch 'origin/master'