nbproject + dante
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	public_html/views/it/content/dante.html