Add NetBeans projects to gitignore
Merge branch 'master' into dev

Conflicts:
	.gitignore
Merge branch 'dev' into dev-tiebreakreports