added .nb-gradle to ignore
Merge branch 'master' into develop

Conflicts:
	.gitignore