safe
Merge branch 'master' of https://github.com/prostoApps/AllApps

Conflicts:
	PlanMyDay/PlanMyDay.xcodeproj/project.pbxproj

PlanMyDay/PlanMyDay.xcodeproj/project.xcworkspace/xcuserdata/yegorkarpec
henkov.xcuserdatad/UserInterfaceState.xcuserstate

PlanMyDay/PlanMyDay.xcodeproj/xcuserdata/yegorkarpechenkov.xcuserdatad/x
cdebugger/Breakpoints_v2.xcbkptlist
	PlanMyDay/PlanMyDay/.DS_Store

PlanMyDay/PlanMyDay/viewControllers/newProject/TTSelectPropertyViewContr
oller.m