Resolve merge conflicts.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7