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

Conflicts:
	bin/SmartPlay.apk
	bin/classes.dex