Merge pull request #1 from nimavakili/develop

minor fixes here and there
Merge branch 'develop' of https://github.com/local-projects/change-by-us-3 into develop

# Via Lucas Vickers
* 'develop' of https://github.com/local-projects/change-by-us-3: