NOJIRA: documentation improvements and Django compatibility fixes
Merge branch 'pahma_4.0-1' of https://github.com/cspace-deployment/pahma_project into pahma_4.0-1