change
Merge branch 'master' of https://github.com/CurtiniOSGroup/DiaryGeo

Conflicts:
	GeoDiaryApp/GeoDiaryApp.xcodeproj/project.pbxproj