Merge
Merge branch 'master' of github.com:Polyphechris/PinballRacer

Conflicts:
	PinballRacer/PinballRacer/PinballRacer.csproj.Debug.cachefile