Revert a675b38..41729c5

This rolls back to commit a675b38153e87218f8aa029787065da72e46d613.
Merge branch 'master' of https://github.com/AprilLab/Dong-Nhi

Conflicts:
	Dong
Nhi.xcodeproj/project.xcworkspace/xcuserdata/huyphan.xcuserdatad/UserInt
erfaceState.xcuserstate