adding elements at risk from OSM
Merge branch 'master' of https://github.com/AmericanRedCross/haiyan_dashboard

Conflicts:
	js/main.js