[IOS6]fix
kommit for syn
more app
Merge branch 'master' into DucVoV_Add_Schedule

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj
	Nurse Management/Classess/Controllers/iPhone/EditShiftVC.xib
Merge pull request #18 from jellydn/DucVoV_Add_Schedule

Duc vo v add schedule
[Finish] Save / Edit Member List in
Merge branch 'Core-Data'

Conflicts:
	Nurse
Management.xcodeproj/project.xcworkspace/xcuserdata/huynhducdung.xcuserd
atad/UserInterfaceState.xcuserstate
Merge branch 'master' into phu-branch