Merge pull request #2121 from jjettenn/master

Fix test data
Redirect controller
Merge pull request #2122 from erwinwinder/master

Redirect controller
Fix import bug
Merge pull request #2124 from erwinwinder/master

Fix import bug
gebruik @resource_href