android-base refreshed
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/gfx/options/water.png