Small typos fixed
Merge 'origin/master' into 'master'
Updated the app delegate with some stuff
Merge 'origin/master' into 'master'