NOJIRA: publicsearch now requires login (for now); advsearch now configured via config file
Merge branch 'rev1' of https://github.com/cspace-deployment/pahma_project into rev1