Merge pull request #9 from Geodan/master

pull request 20140313
Merge pull request #10 from Geodan/master

pull request 20140313
Merge pull request #11 from Geodan/master

pull request 20140314
Delete Incidents with confirmation
Merge branch 'master' of https://github.com/MartijnHeuff/icm-ui

Conflicts:
	templates/incident.html
layout incident
Merge pull request #88 from MartijnHeuff/master

incident layout and delete