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

Conflicts:
	Nurse Management/Classess/Controllers/iPhone/EditShiftVC.xib
Merge branch 'Core-Data'

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

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj
Merge branch 'phu-branch'

Conflicts:
	Nurse Management/Classess/Controllers/iPhone/EditShiftVC.xib
Merge many branches to master