#1639 #1730: Integration bugs.
Merge branch 'SCHOLAR-3.x' of github.com:openscholar/openscholar into master7
#1754: Change out label names when adding/removing attached files.