Statefull setup
Merge branch 'master' of https://github.com/Geodan/icm-ui

Conflicts:
	src/app.js
	src/berichtenCtrl.js