Bugfix for router.
Merge branch 'master' into new-admin-dashboard
Remove collection-hooks and misuse collection validator to add fields.