Merge pull request #18 from Geodan/master

laatste versie van main
Merge pull request #80 from MartijnHeuff/master

incident add/edit
Merge pull request #19 from MartijnHeuff/master

Martijns werk
Layout puntjes
Merge branch 'master' of github.com:stvno/icm-ui

Conflicts:
	index.html
Merge pull request #81 from stvno/master

Martijn en mijn werk gemerged
Merge pull request #9 from Geodan/master

pull request 20140313