Huy update linh tinh
Merge branch 'master' of https://github.com/AprilLab/movenpick

Conflicts:
	movenpick/movenpick.xcodeproj/project.pbxproj