Merge pull request #8 from Geodan/master

merge from steven
Map working again after merge
tussencommitje
Peer extents working
just committing
Got the *&$%^$ leaflet objects to emit an id. Now deleting objects from map works.
Merge pull request #20 from tomvantilburg/master

Big leaflet update
Got the editing working
even better editing now
Merge pull request #21 from tomvantilburg/master

editing features functional
Cleaned the scope of leafletCtrl
Started on a service for the map
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	src/beeldCtrl.js
	src/leafletCtrl.js
HeaderCtrl.js removed
Merge pull request #1 from Geodan/master

merge from master
Working on map edit tools
Merge pull request #9 from Geodan/master

Merg from steven
ignored .idea folder
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui

Conflicts:
	src/leafletCtrl.js
Merge pull request #23 from MartijnHeuff/master

Merge pull request #1 from Geodan/master
Drawing custom features (icon, line, polyg) works now (jay!)