updates made per the update in the GlimmpseiPhone project
Merge branch 'develop' into release-1.0