Merge pull request #33 from Geodan/master

merge from origin
Added id to map
Starting position for new incident fixed to HHNK
Merge pull request #90 from tomvantilburg/master

merge from Tom