Pushing in stuff that somehow is uncommitted… written by D on 8/6
Merge branch 'develop' of github.com:parworks/PARWorks-iOS into develop