[New] Member list - Update Japanese text
[New] Add Shift - Implementing this screen
[New] Add Shift - Implementing
Merge branch 'master' into phu-branch

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj
	Nurse Management/Classess/Controllers/iPhone/AddShiftVC.xib
	Nurse Management/Resources/Images/Common/ic_nurse.png
	Nurse Management/Resources/Images/Common/ic_nurse@2x.png
[New] Add Shift - Linking to HomeVC
Merge pull request #6 from jellydn/phu-branch

Phu branch
Merge pull request #9 from jellydn/DucVoV_Add_Schedule

[Duc.vov]fix IOS6
[Fix] Add Shift - Update project file
Merge pull request #10 from jellydn/phu-branch

[Fix] Add Shift - Update project file
Merge pull request #11 from jellydn/DucVoV_Add_Schedule

[Duc.vov]fix ios6
[New] Add Shift - Apply choose time view to the screen
Merge pull request #12 from jellydn/phu-branch

[New] Add Shift - Apply choose time view to the screen
[Fix] Member List - Fix official name can be edited
Merge pull request #13 from jellydn/phu-branch

[Fix] Member List - Fix official name can be edited
[Fix] Add Shift - Fix crashed bug in choose time view
Merge pull request #14 from jellydn/DucVoV_Add_Schedule

[Fix] Button iOS 6 and rename title for shift category name
Merge pull request #15 from jellydn/phu-branch

[Fix] Add Shift - Fix crashed bug in choose time view
[Fix] Support UI for iOS 6.1
Merge branch 'master' into phu-branch
Merge pull request #16 from jellydn/phu-branch

[Fix] Support UI for iOS 6.1