Merge branch 'master' of https://github.com/liananse/tong

Conflicts:
	bin/Tong.apk
	bin/classes.dex
	bin/classes/com/mobilepower/tong/ui/activity/ShopPageActivity.class
Merge branch 'master' of https://github.com/liananse/tong

Conflicts:
	bin/Tong.apk
	bin/classes.dex
	bin/classes/com/mobilepower/tong/ui/activity/ShopPageActivity.class
Merge branch 'master' of https://github.com/liananse/tong

Conflicts:
	bin/Tong.apk
	bin/classes.dex
	bin/classes/com/mobilepower/tong/ui/activity/ShopPageActivity$1.class
	bin/classes/com/mobilepower/tong/ui/activity/ShopPageActivity.class