STRONGER
STRONGER
Merge remote-tracking branch 'origin/master' into trial

Conflicts:
	MainActivity.java