no message
Merge branch 'master' of https://github.com/gis-pluggedin/web

Conflicts:
	js/main.js