#407 Changing Incident to Map Report
Merge branch 'fixes-20140218' into develop