Suspicious configuration changes.
Merge branch 'master' of https://github.com/bmfekete/WBMplus

Conflicts:
	nbproject/private/private.xml