Please take this
Merge branch 'master' of https://github.com/jinsein/1001

Conflicts:
	SYAndroidApp/bin/SYAndroidApp.apk
	SYAndroidApp/bin/classes.dex
	SYAndroidApp/bin/resources.ap_
Please take this too!