UI...
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/def/statix/fragments/RenderingSurfaceFragment.java