aa
Merge branch 'master' of github.com:kanon1109/geckosCocos2dxUtils

Conflicts:
	Classes/utils/ScreenUtil.cpp