Merge branch 'master' of https://github.com/museumvictoria/mv-fieldguide-ios

Conflicts:
Field Guide 2010.xcodeproj/project.pbxproj
Fixed local conflict with project file