Change in properties
Merge branch 'master' of https://github.com/no3z/deBlock3

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/project.properties