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

Conflicts:
	Nurse Management/Classess/Controllers/iPhone/EditShiftVC.xib
[Enh] Add Shift - Integrating Choose Member view
Merge branch 'phu-branch'

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