""
Merge branch 'master' of https://github.com/sekklow/RollerCoasterPinball

Conflicts:
	Library/guidmapper
	RollerCoasterPinball-csharp.sln
	RollerCoasterPinball.userprefs