First step of converting to spring security
second step. shiro has been removed
Fix test and various.
Fix test and various.
Fix test and various.
Swithc over to annotations
Swithc over to annotations
More annotation switching
Remove old stuff, add comments.
Fix some errors.
handle internal access cond being not there.
Remove commented out code.
Merge branch 'master' into feature/acm-spring_sec

Conflicts:
	src/banjo/controllers/BulkUploadJobsController.java
	src/banjo/controllers/JobsController.java
	src/banjo/controllers/NonCollectionMaterialUploadController.java
	web/WEB-INF/spring/app/security.xml
	web/WEB-INF/views/works/show.ftl
Add anon route to security file.
remove 'test' env and add 'migration'
Merge branch 'master' into feature/acm-spring_sec

Conflicts:
	src/banjo/controllers/WorksController.java
Merge pull request #878 from nla/feature/acm-spring_sec

DO NOT MERGE - Use Spring security rather than Shiro.