niks
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/project.properties
	war/WEB-INF/built-jar.properties