Template updates
Merge branch 'master' of https://github.com/neiljdo/readysaster-icannhas-web

* 'master' of https://github.com/neiljdo/readysaster-icannhas-web:
  - Fixes to fetching floodmap
  - Added hazard app

Conflicts:
	readysaster-icannhas-web/rp/models.py
Merge branch 'master' of https://github.com/neiljdo/readysaster-icannhas-web

* 'master' of https://github.com/neiljdo/readysaster-icannhas-web:
  - Bugfixes