some structure for popups
Merge branch 'master' of https://github.com/ddsc/webclient

Conflicts:
	app/scripts/lizard/layers/DdscMarkerLayer.js