Ignore Netbeans project files.
Merge remote-tracking branch 'origin/master' into Export_Persistance_Integration

Conflicts:
	.gitignore