I should have committed this yesterday, I think it fixes things.
Merge branch 'master' of https://github.com/CurtiniOSGroup/DiaryGeo

Conflicts:
	GeoDiaryApp/GeoDiaryApp/CUTableView.m
	GeoDiaryApp/GeoDiaryApp/CUTableViewCell.m