Merge branch 'add-example-input' into develop
Merge branch 'fix-tests' into develop
Add permissions to redirected urls
Merge branch 'add-permissions' into develop
Merge branch 'add-permissions' into develop

Conflicts:
	code/RedirectedURL.php
Merge branch 'fix-csv-import' into develop
Testing fork
Wildcard redirects
Wildcard update
Addition comments in code
merge branch guttmann-wildcard-redirect, conflicted README.md
Merge branch 'guttmann-wildcard-redirect'