Properly exclude path from VSite.
Improve comments.
Check parent::active().
Fix tests.
Fix.
Fix os_reader view.
Fix facets tests.
Fix calendar test.
Merge branch '5628' of github.com:openscholar/openscholar into 5628
Fix taxonomy widget tests.
Create boxes during tests.
Merge branch '5628' of github.com:openscholar/openscholar into 5628
Fix media gallery test.
Fix name.
Fix cache tests using views_og_cache patch.
Fix name of checkbox.
Trigger tests.
Merge branch '5628' of github.com:openscholar/openscholar into 5628
Update import.sh
Merge branch 'SCHOLAR-3.x' into 5628

Conflicts:
	openscholar/drupal-org.make