Code style fixes in EngineMaster
Add Hercules Mk4 Support, fixes https://bugs.launchpad.net/mixxx/+bug/1213752
Added Federico Briata to contributor list. Thank you very much!
Fixed merge conflicts.