Updated project settings and did minor cleanup.
Merge branch 'code-clean' into v1.1-beta
clean-up whitespace, fix formatting inconsistencies.