register

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>
Merge branch 'develop' of https://github.com/columby/www.columby.com into develop

Signed-off-by: A. van der Pluijm <info@urbanlink.nl>

Conflicts:
	client/app/routes/dataset/dataset.controller.js