hei
Merge branch 'master' of https://github.com/jQrgen/OSoving1x

Conflicts:
	nbproject/private/private.properties
Merge branch 'master' of https://github.com/jQrgen/OSoving1x

Hei