term and privacy
[Fix] Add Shift - Fix compatibility the 3.5 inch iPhone screen
data for term and privacy
Merge branch 'master' of https://github.com/jellydn/Nurse-Management into data_term
Merge pull request #34 from jellydn/data_term

Data term
Merge pull request #35 from jellydn/phu-branch

[Fix] Add Shift - Fix compatibility the 3.5 inch iPhone screen
[Fix] 3.5 inch for Edit Shift Category
fixbug
Merge pull request #36 from jellydn/Fixbug

Fixbug
[Fix] Add Shift - Fix the compatibility in 3.5 inch screen
Merge branch 'TienLP'

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj
Merge branch 'phu-branch'
[Fix] Project file - Update project file
Merge branch 'master' into TienLP