1
Merge branch 'master' of https://github.com/jiatongzhou/SmartPlay

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/SmartPlay.apk
	bin/classes.dex
	bin/classes/com/smartplay/MainActivity$DummySectionFragment$1.class
	bin/classes/com/smartplay/MainActivity$DummySectionFragment$2.class
	bin/classes/com/smartplay/MainActivity$DummySectionFragment.class
	bin/classes/com/smartplay/MainActivity$SectionsPagerAdapter.class
	bin/classes/com/smartplay/MainActivity$SendData.class
	bin/classes/com/smartplay/MainActivity.class
	bin/resources.ap_