Some DJ UI work and improved functionality
Merge branch 'master' into slide-transitions

Conflicts:
	client/index.html
	client/src/app.js
Merge pull request #34 from KyleW/slide-transitions

DJ controller now updating database correctly