qwe
dwa
Merge branch 'master' into develop

Conflicts:
	test/test.xcodeproj/project.pbxproj
	test/test.xcodeproj/project.xcworkspace/xcuserdata/vunguyen.xcuserdatad/UserInterfaceState.xcuserstate
	test/test/HelloWorldLayer.m
	test/test/Resources/Icon-72.png
	test/test/Resources/Icon-73.png
	test/test/Resources/Icon-74.png