test
[TienLP] calendar --> next select day when add quick shift
Merge branch 'master' into TienLP

Conflicts:
	Nurse Management.xcodeproj/project.xcworkspace/xcuserdata/tienlp.xcuserdatad/UserInterfaceState.xcuserstate
[TienLP] load Shift Category in Add quick Shift
[TienLP] load schedule category in Add quick Schedule
[TienLP] test
[TienLP] Home --> Add quick Schedule --> add prototype choose time view
[TienLP] Add quick Schedule --> return info to save schedule in HomeVC
Merge branch 'Core-Data' into TienLP

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj
	Nurse Management/Classess/Controllers/iPhone/ListShiftPatternVC.m
	Nurse Management/Classess/Model/CDShiftCategory.h
	Nurse Management/Classess/Model/CDShiftCategory.m
	Nurse Management/Nurse_Management.xcdatamodeld/Nurse_Management.xcdatamodel/contents
Merge branch 'TienLP' into phu-branch

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj