Pull data live from geoserver.

Also added jquery as a dependency, mainly for ajax, but maybe for
other stuff later.
Merge remote-tracking branch 'origin/master'

Conflicts:
	map.html