work in progress
Merge branch 'master' of https://github.com/lumannnn/AudioRacer

Conflicts:
	AudioRacer-Ui/src/at/fhv/audioracer/ui/pivot/MapComponentSkin.java