[Location Recovery Status]
Merge origin/master

Conflicts:
	application/controllers/Incident.php
	application/views/js/formSubmission.js