[Fix] 3, 4, 5
Merge branch 'Thien-branch'

Conflicts:
	Nurse Management/AppDelegate.m