bug
Merge branch 'bug'

Conflicts:
	MainActivity.java