change # 16

move legend; hide legend when it shows chart
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
	layers.xml
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	nbproject/project.xml