Merge branch 'master' of private dev tuner into release-0.10.0
partially completes https://app.asana.com/0/8015405903158/8043028030025

Conflicts:
	build.sbt
	project/plugins.sbt
	src/main/scala/tuner/gui/JoglMainPlotPanel.scala
	src/main/scala/tuner/gui/opengl/ValueShader.scala