Add volume control
Merge remote-tracking branch 'origin/client-dev' into client-dev

Conflicts:
	client/js/config.js