Merge branch 'SCHOLAR-3.x' into 3166-og-moderation.
Update the OG modration version.
Merge branch '3166-og-moderation' of github.com:openscholar/openscholar into 3166-og-moderation
#3311: Revert Allow group to override the permission and roles.
add "People" menu links to all presets #3307
Merge pull request #3675 from openscholar/3311

Revert Allow group to override the permission and roles
run JS lint #3275
add file doc block and use '$' instead of 'jQuery' #3275
Handle with the spaces access and the import text.
remove on_start callback, add empty on_update callback #3275
Display only feeds from this viste.
Merge pull request #3676 from openscholar/2859-people_link

add "People" menu links to all presets #3307
Merge pull request #3677 from openscholar/3275-cp_layout_js

Clean up code for CP Layout javascript #3275
convert to db_select, correct logic in vsite_access.install #3660
Merge pull request #3679 from openscholar/3660-update

convert to db_select, correct logic in vsite_access.install #3660
standardize names and preset options order in vsite reg form #3307
Merge pull request #3681 from openscholar/3307-naming

standardize names and preset options order in vsite reg form #3307
Merge pull request #3420 from openscholar/3166-og-moderation

Adding the OG moderation module.
add context reaction blocks export to all 4 presets #3695
Merge pull request #3696 from openscholar/3695-context

add context reaction blocks export to all 4 presets #3695