updates before checking out master
Merge branch 'master' of https://github.com/kinetech/Performance into volume
implements color spectrum
Merge pull request #30 from kinetech/volume

implements color spectrum
Click -> touchend in MC events
Merge branch 'master' of https://github.com/kinetech/Performance

Conflicts:
	public/javascript/fireworks/fireworks-animation.js
Merge branch 'master' into updateClient

Conflicts:
	public/javascript/fireworks/fireworks-animation.js
Merge branch 'updateClient' of https://github.com/kinetech/Performance into updateClient

Conflicts:
	app.js
	public/javascript/fireworks/fireworks-animation.js
Added latest changes for the visualizer color management to the client. Moved pusher.color.min from /fireworks to /javascript so it is available to client and fireworks
Client color matches visualizer color closer