asd
Merge remote-tracking branch 'origin/master'

Conflicts:

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/AndroidAnimTranslateActivity$1.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/AndroidAnimTranslateActivity.class