asd
asd
asd
asd
asd
asd
Merge branch 'goban'

Conflicts:
	app/build.gradle
	app/src/main/java/org/kastberg/stlviewer/STLRenderer.java
	app/src/main/res/values/strings.xml