Changelist2
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
changes in main.xml or MainActivity.java