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

Conflicts:
	AudioRacer-Camera/.classpath
	AudioRacer-Camera/src/at/fhv/audioracer/camera/OpenCVCamera.java