[Add Control]
[TienLP] Add quick schedule view --> fix time
Merge branch 'Core-Data'

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj
	Nurse Management/Classess/Controllers/iPhone/EditShiftVC.xib
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
Merge branch 'master' into phu-branch