Merge pull request #29 from Geodan/master

merge from origin
Got the map for incidentlocation working (finally!)
Perhaps accidentally added the incidentModal.html back into the tree
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	index.html
Merge pull request #82 from tomvantilburg/master

merge from Tom