-FB / Parse changes
Merge branch 'develop' of https://github.com/cjwhitsitt/scavengely into develop