Егор: добавлены ам/пм часы
Merge branch 'master' of https://github.com/prostoApps/AllApps

Conflicts:
	.DS_Store
	PlanMyDay/PlanMyDay/viewControllers/TTStatisticsViewController.m
merge
merge