Merge remote-tracking branch 'upstream/develop' into develop
[gh-401] Add Organic Groups and Views Bulk Operations modules

VBO is a dependency of OG UI
Merge pull request #551 from erasmussen2/issue-401

Closes #401
Merge remote-tracking branch 'eric/issue-401'
Merge remote-tracking branch 'upstream/master' into develop
Update develop