Refactoring into super class
Merge branch 'master' of https://github.com/uqlibrary/uqlapp