NOJIRA: getting rid of toy test app shelvedimages
Merge branch 'rev1' of https://github.com/cspace-deployment/pahma_project into rev1