[Enh] Shift Category
Merge branch 'Core-Data' into phu-branch

Conflicts:
	Nurse Management/Classess/Controllers/iPhone/EditShiftVC.xib