Added NetBean files
Added NetBean files
Merge branch 'master' of https://github.com/Nicolai-/Matador-BFJ_RJC_NST

Conflicts:
	Matador/nbproject/private/private.properties
	Matador/nbproject/private/private.xml