fix
Merge branch 'master' of https://github.com/TitaniumTeam/iFootball
fix
Merge branch 'master' of https://github.com/TitaniumTeam/iFootball

Conflicts:
	Resources/ui_app/MenuTong.js
jhg