1
Merge branch 'master' of https://github.com/nguyenhaidang/test

Conflicts:
	test.xcodeproj/project.xcworkspace/xcuserdata/dang.xcuserdatad/UserInterfaceState.xcuserstate
	test/FRViewController.m