Merge branch 'orgin'

Conflicts:
	AndroidManifest.xml
	bin/.gitignore
	bin/AndroidManifest.xml
	bin/Training.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/ff/training/activity/MainActivity.java