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

Conflicts:
	Scavengely/Scavengely-Info.plist
-still camera change