Merge pull request #3 from Geodan/master

merge from steven
Merge pull request #4 from Geodan/master

merge from steven
Added preliminary map functionality in angular
Merge branch 'master' of https://github.com/Geodan/icm-ui into Geodan-master

Conflicts:
	templates/kaart.html
Merge pull request #3 from tomvantilburg/master

Succes met de merge !