clean up mess
Merge branch 'master' into multiplyFolders
remove old merge conflicts
still problems with relocating a directory
Merge branch 'master' into master_sync_clean
Merge branch 'master' into master_sync_clean
no, maximum vinyl inputs 4!
Merge branch 'master' into master_sync_clean

Conflicts:
	mixxx/src/engine/bpmcontrol.cpp
	mixxx/src/engine/enginebuffer.cpp
Fixes for master/slave lights not behaving
Merge branch 'master' into multiplyFolders
Fix midi lights not staying in sync
Change xone configuration for master sync mode
Fix vinyl input toggling not working correctly
Fix return type in TwoWayMessagePipe.
Check for NULL before TrackPointer deref.
Merging from lp:mixxx.
Brute-force importing of master_sync work done in github.
Fix a merge issue.
Be explicit about position in calls to getPhaseOffset.
Minor logic cleanup in BpmControl.
Remove redundant initialization of m_iSyncState.