MERGE COMMIT
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/web/index.xhtml
	build/web/registration.xhtml
	nbproject/project.properties