[Evacuation Site Mapping]
[Evacuation Sites and forms Merged]
[polyHome modified]
Merge origin/master

Conflicts:
	application/views/includes/header.php