i coach
i coach
power hour
modify power hour
show power hour
finish library
delete managers
MERGE VERSION
Merge branch 'master' of https://github.com/infoyou/QiXin

Conflicts:
	Application/Project/Controller/BJControllers/PowerHour/BJPowerHourDetailViewController.m
	Application/Project/Controller/BJControllers/PowerHour/BJPowerHourRegViewController.xib
	Application/Project/Controller/BJControllers/PowerHour/PHSummaryViewController.h
	Application/Project/Controller/BJControllers/PowerHour/PHSummaryViewController.m
	Application/Project/Controller/BJControllers/PowerHour/PHSummaryViewController.xib
	Application/Project/Controller/BJControllers/PowerHour/PHTraineeConfirmViewController.h
	Application/Project/Controller/BJControllers/PowerHour/PHTraineeConfirmViewController.m
	Application/Project/Controller/BJControllers/PowerHour/PHTraineeConfirmViewController.xib
	QiXin.xcodeproj/project.pbxproj
	QiXin.xcodeproj/project.xcworkspace/xcshareddata/QiXin.xccheckout
	QiXin.xcodeproj/project.xcworkspace/xcuserdata/artistgrammer.xcuserdatad/UserInterfaceState.xcuserstate
	QiXin.xcodeproj/xcuserdata/artistgrammer.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist