Merge changes associated with new Hibernate impl of user roles
Merge
Merge
Modifications to support User Feature restrictions
Merge
Merged xdat jars
Merge updates to xdat jars
XNAT-3201 Bogus resource URLs will no longer throw NullPointerExceptions.
Merge
Added the search term to the context on quick search to support custom pages that want to display it.