Merge branch 'master_new_add_gameView' of https://github.com/orangehunter/Music-Salvation into master_new_add_gameView

Conflicts:
	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/Bottom.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/Constant.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/Coordinate.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/EditView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/GameView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/Graphic.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/MainActivity.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/MainView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/MapView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/MySeekBar.class
	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/Number.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/ScoreView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/StartView.class
	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/Story.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/TestView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/chartBottom.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/chartLine.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/chartScan.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/gameChartBottom.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/gameChartScan.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/BuildConfig.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/R$attr.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/R$drawable.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/R$raw.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/R$string.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/R$style.class

	MusicSalvationSDKVerson/bin/classes/com/example/musicsalvationsdkverson/R.class