When a user is made a member of a site give them the "vsite user" role by default, #1358
Merge branch 'SCHOLAR-3.1' of github.com:openscholar/openscholar into SCHOLAR-3.1