Style cleanup

I changed ambiguous variable names (button1, textView1) to something
more meaningful.
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/intermediates/model_data.bin