something...
Merge branch 'master' of https://github.com/tomvantilburg/icm-ui

Conflicts:
	src/app.js