port back most of the changes of mukustes fixes branch

git-svn-id: svn://svn.code.sf.net/p/vpinball/code/trunk@899 14438d79-0ffd-4333-8ae7-ea2bdd901387
Merge branch 'master' into fixes

Conflicts:
	CMakeLists.txt