Merge branch 'master' of https://github.com/nesi/projectdb-webapp.git into eva
Updated AdviserControlsTest to fix testAllowDuplicateFullNameAsNewAdviser
Added ProjectControlsTest
Updated root-context to add projectcontrols bean
Merge branch 'rest-refactoring' of https://github.com/nesi/projectdb-webapp.git into eva
Fixed issue on root-context.xml
Added Controls-context.xml to seperate from existing test config
Merge branch 'rest-refactoring' of git@github.com:nesi/projectdb-webapp.git
Merge branch 'master' of git@github.com:nesi/projectdb-webapp.git
Merge branch 'rest-refactoring' of git@github.com:nesi/projectdb-webapp.git into HEAD
Merge branch 'master' into eva
Merge branch 'rest-refactoring' of git@github.com:nesi/projectdb-webapp.git into eva
Merge branch 'rest-refactoring' of git@github.com:nesi/projectdb-webapp.git into eva
Merge branch 'eva' into rest-refactoring