Spell check and CS report stuff
Merge branch 'develop'