Refreshed code base, stepwise migration to iOS 7.x
Removed added calendar cells
Merge remote-tracking branch 'origin/master'