Test
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Add google analytic
Merge remote-tracking branch 'origin/master'
[Fix] Reload calendar when category are
Merge pull request #48 from jellydn/category

[Fix] Reload calendar when category are
Change API for MoreAPP
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into TienLP

Conflicts:
	Nurse Management.xcodeproj/project.pbxproj