Merge pull request #20 from Geodan/master

merge from origin
Putting d3 layer back where it was before
Merge pull request #57 from tomvantilburg/master

d3 layer put back
Merge branch 'master' of https://github.com/Geodan/icm-ui into Geodan-master