Merge branch '1048-url-collision-3.3' of https://github.com/openscholar/openscholar into SCHOLAR-3.3
Merge branch 'SCHOLAR-3.3' of github.com:openscholar/openscholar into SCHOLAR-3.3
Fixed os-events views tabs setting for taxonomy.  #1048