merge
Merge remote-tracking branch 'origin/master'

Conflicts:

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/R$id.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/R$layout.class

	AndroidAnimTranslate/bin/classes/com/exercise/AndroidAnimTranslate/R$string.class
	AndroidAnimTranslate/res/layout/buttons.xml

	AndroidAnimTranslate/src/com/exercise/AndroidAnimTranslate/AndroidAnimTranslateActivity.java