username en incident ind e header
css zut, maar kaart lijkt gebroken
Merge pull request #10 from Geodan/master

Merge pull request #50 from stvno/master
Working on layer control
Merge pull request #18 from Geodan/master

merge from origin
Merge pull request #52 from MartijnHeuff/master

Diff, inclusief gebruik van textAngular en Font Awesome
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	templates/beeld.html
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui
Merge pull request #53 from tomvantilburg/master

working on layers
Changed projection to RD
Nicer layer menu
New background layer
showing Online/offline users
Merge branch 'master' of github.com:stvno/icm-ui
Merge pull request #55 from tomvantilburg/master

Changed projection to RD
merge van stevens werk
merge with main
Merge pull request #56 from stvno/master

online user control
Merge pull request #5 from Geodan/master

pull request 20140306