Addwarn
Merge branch 'master' of https://github.com/mattseymour/envhack

Conflicts:
	webapp/static_dev/js/map.js