...
Merge branch 'master' of https://github.com/ddsc/webclient

Conflicts:
	app/index.html
	app/scripts/lizard/lizard.map.js
	app/scripts/lizard/lizard.views.js
cleaning up