1104
Merge remote-tracking branch 'origin/master_new_add_gameView' into master_new_add_gameView

Conflicts:
	MusicSalvationSDKVerson/bin/MusicSalvationSDKVerson.apk
	MusicSalvationSDKVerson/bin/classes.dex
	MusicSalvationSDKVerson/bin/resources.ap_