Merge forkedhtc/master

Conflicts:
	css/gui.css
	css/label1.css
	index.html
	js/guiInteractivity.js
	js/label.js
	js/layers.js
	js/main.js
	js/style_chooser.js
	js/styles.js
Merge originhtc/master
Merge webgis/master

Conflicts:
	test5.php
Merge originhtc/master
Merge pull request #6 from jedi-Knight/master

new markers, slightly raised ctrl panel