add ordering to make redirects come before content items
Merge branch 'v7.1' of github.com:phpwax/wildfire.content into v7.1