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

merge from origin
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