Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/collectiveaccess/pawtucket2 into develop
NOJIRA fix broken document viewer