Added volume slider
Call Java from JavaScript
Removed old jQuery 1.7.1
Merge branch 'master' of github.com:msteiger/play-dataeditor

Conflicts:
	app/views/main.scala.html