Merge pull request #6 from tomvantilburg/master

Added d3layer stuff
Merge pull request #7 from tomvantilburg/master

Map menu
Merge pull request #14 from tomvantilburg/master

Messing with states and controllers to find out why controllers are call...
Merge pull request #16 from tomvantilburg/master

Map styling and map editing
refactoring koppeling cow<>angular
Merge pull request #17 from tomvantilburg/master

Removed submodule angular-leaflet-directive
opschonen
projecten nieuwe stijl
items en projecten werken
beelden werkend
Tom's versies teruggezet (werken niet!)
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	src/icm.js
	templates/beeld.html
Merge pull request #19 from tomvantilburg/master

Map listeners working now.
Merge pull request #8 from Geodan/master

merge from steven