some file edits
Merge branch 'develop' of https://github.com/ajency/BenSmiley into develop