Reorder OG roles: Basic Member is first, Administrator is last.
Don't add prefix when editing a creating/term.
Merge pull request #6734 from openscholar/6647

Don't add prefix when editing a creating/term.
#6732: Don't set cache if 'random' option is set.
#6731: Don't call get_cache if we have no intention of calling set_cache.
Merge pull request #5814 from openscholar/5753

Reorder OG roles
Merge pull request #6736 from openscholar/6731-facetapi_cache

Don't call get_cache if we have no intention of calling set_cache
Merge pull request #6735 from openscholar/6732-random_featured_posts

Don't set cache for featured posts widget if 'random' option is set.
modified how conditional statements work when the data value is an array
Merge pull request #6738 from openscholar/5749-2

modified how conditional statements work when the data value is an array
make first contextual gear link -5px above the first node in the list. #6645
Merge branch 'SCHOLAR-3.x' into 6673
added entity type to queries and switched db calls from db_query to db_select