play with ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidAnimTranslate/res/layout/main.xml