zw - merging the changes made in the private repo
Merge pull request #6 from zwarburg/mergingAppFolioChanges

zw - merging the changes made in the private repo