Update ctools.
Update views.
Adding the views_og_cache module.
Update the views og cache module, minor fix in the os module, and update the views.
Update two more views.
Apply ctools patches.
Migrate more sites for the dummy content.
Merge branch 'SCHOLAR-3.x' into 1274
Adding test.
Added an is_object check on the node in the contextual_link_alters hook.  #1346
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
#1261: Handle duplicated files.

Update the one in use with better data from the one not in use, then delete the one not in use.
Fixed sv list's biblio type filtering.  #1348

The sv list used to have a checkbox for selecting if all publication types should be shown or just a subset of them.  When clicked the checkbox was supposed to show/hide the list of publication types, but this didn't work so well with Drupal form states since the checkbox itself was only visible when biblio content was selected.  The checkbox was removed, but its setting was still being checked before biblio types were filtered.

The fix was to stop checking for that setting.  New sv list boxes get the full list of biblio types all enabled.

The only problem with this is that the existing sv lists won't have any biblio types checked if they were kept default.  Currently working around that by only filtering types when there's at least one type selected (the assumption being that an sv list with 0 biblio types default, and not deliberate).  An update hook would be a more correct fix though.
#1261: Everything appears to work. Now to test on prod data.
Remove sorting, filtering by author, and turn back on publication list caching, #1366
Fix merge error in gking.css, causing errors in 3.1
Fix merge error in ballard.css
Add box caching.
Prefix CID by group ID.