Merge branch 'dequeue' of github.com:Infogroep/imp-web into dequeue

Conflicts:
	js/imp.js
Merge branch 'dequeue' of github.com:Infogroep/imp-web into dequeue

Conflicts:
	js/imp.js