Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	.idea/vcs.xml
	app/src/main/java/org/kastberg/stlviewer/STLActivity.java
	app/src/main/java/org/kastberg/stlviewer/STLRenderer.java
	app/src/main/java/org/kastberg/stlviewer/STLSurfaceView.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	app/src/main/java/org/kastberg/stlviewer/STLRenderer.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	.idea/vcs.xml
	app/src/main/java/org/kastberg/stlviewer/STLActivity.java
	app/src/main/java/org/kastberg/stlviewer/STLRenderer.java
	app/src/main/java/org/kastberg/stlviewer/STLSurfaceView.java