Merge branch 'master' into production
JS work pleaseeeeee
UGH JS LOAD ON SERVER DO IT
Merge branch 'production'
Merge branch 'master' of https://github.com/gardenm/rhok-nsi
Merge branch 'master' of https://github.com/gardenm/rhok-nsi
Added Legend
Merge branch 'master' of https://github.com/gardenm/rhok-nsi

Conflicts:
	www/public/css/map.css