Merge pull request #80 from MartijnHeuff/master

incident add/edit
Merge pull request #29 from Geodan/master

merge from origin
Merge pull request #81 from stvno/master

Martijn en mijn werk gemerged
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
Merge pull request #83 from stvno/master

Incidenten layout bijgewerkt
Merge pull request #84 from stvno/master

Wijzigen tekst style aangepast
Merge pull request #20 from Geodan/master

toms stuff