的
修改gallery滑动
Merge branch 'master' of https://github.com/wangkenan/d9game.git

Conflicts:
	src/me/key/appmarket/MarketApplication.java