merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidAnimTranslate/bin/AndroidAnimTranslate.apk
	AndroidAnimTranslate/bin/classes.dex
	AndroidAnimTranslate/bin/resources.ap_