创建fps显示用的label时出现异常，png读取错误，此png是cpp里的字节码 ，修正之
revert README.md
Merge branch 'master' of https://github.com/minuowa/freeapp

Conflicts:
	.gitignore
	Classes/ObjectBase.cpp
	Classes/ObjectBase.h
	Classes/SceneObjCommon.h
	proj.android/jni/Android.mk
	proj.win32/SummerShell.v11.suo
	proj.win32/SummerShell.vcxproj
	proj.win32/SummerShell.vcxproj.filters