Brand new volume control
Merge branch 'master' of github.com:willcrichton/mystro

Conflicts:
	www/js/data.js
Volume control bugfixes part 1.
Merge branch 'master' of github.com:willcrichton/mystro

Conflicts:
	www/js/data.js