Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	web/index.html