Merge pull request #1 from openscholar/SCHOLAR-3.x

Scholar 3.x
Merge branch 'SCHOLAR-3.x' of https://github.com/openscholar/openscholar into SCHOLAR-3.x
add core patch for APC redeclared class bug #3202
Merge pull request #3205 from baisong/3202-make

add core patch for APC redeclared class bug #3202