I dont know what anders changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	daniel/app/src/main/java/com/graungaard/pvc_app/ToolHandler.java