editmode

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

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

Conflicts:
	packages/accounts/public/assets/css/accounts.css
	packages/accounts/public/assets/css/accounts.less
	packages/columby/public/assets/css/columby.css