Add 4 deck skins
Merge remote-tracking branch 'mixxx/master' into mastersync_skins
Update with the skin I have locally
updates to skin and xone configuration
One more change
make sync_enabled a toggle button
Merge branch 'mastersync_skins' of github.com:ywwg/mixxx into mastersync_skins

Conflicts:
	res/keyboard/en_US.kbd.cfg
	res/schema.xml
Update skin for new group
Update skin with newer CO for internal bpm
Update Xone script, also update skin for reverseroll function
clean up the diff from master a little
Merge remote-tracking branch 'ywwg/master' into mastersync_skins
Merge remote-tracking branch 'origin/mastersync_skins' into DJO-hacks-trunk

Conflicts:
	res/controllers/Xone K2.midi.xml
	res/controllers/Xone-K2-scripts.js
	scripts/make_xone.py