Merge branch 'master' of https://github.com/ejohmac/PropelAdApp
new dir
deletes