v0.3
Merge branch 'master' of https://github.com/coreMember/studyNewTechnique

Conflicts:
	mi/MyCppGame/cocos2d/external/tiff/prebuilt/winrt/ARM/libtiff.lib