Import latest fixes for Kontrol X1
Import latest fixes for Kontrol F1
Adjust scratch parameters
Add patch to fix compile errors on OS/X
Merge remote-tracking branch 'upstream/master' into controllers-pioneer-cdj-hid
Merge remote-tracking branch 'upstream/master' into controllers-traktor-kontrol-x1
Merge remote-tracking branch 'upstream/master' into controllers-traktor-kontrol-f1
Merge pull request #190 from hile/controllers-traktor-kontrol-f1

Controllers traktor kontrol f1
Merge pull request #189 from hile/controllers-traktor-kontrol-x1

Controllers traktor kontrol x1
Merge pull request #188 from hile/controllers-pioneer-cdj-hid

Controllers pioneer cdj hid
Merge pull request #187 from hile/osx_mavericks_build_fix

Add patch to fix compile errors on OS/X