#1480 #1199, Ajax event keeps entityreference prepopulate from working when "hide on edit" is used.
Merge branch 'SCHOLAR-3.1' of github.com:openscholar/openscholar into SCHOLAR-3.1
Merge branch 'SCHOLAR-3.1' of github.com:openscholar/openscholar into SCHOLAR-3.1