Merge branch 'master' into sass-singularity

* master:
  removes vestigeous views prerender code
  massive features overhaul, and related css selector changes
  patched features
  rerolling occupy_views to have article sidebar links (again)
  removed border bottom on related stories analysis bit
  rerolled views feature still trying to get articles_events context into the occupy_context features
  moved features-override to patched module folder and applied patch #5 from https://drupal.org/node/1823388
  features module to dev branch
  updates to geofield
  updates to media
  upgrades to bef (test files didnt get added in previous commit)
  updates to beter exposesd filters
  added articles and events context back into contexts feature
  rerolling occupy_content feature in hopes of getting internal_touts links to express on dev
  features, template.php changes and content ti\ype definitions for related stories, and article sidebarlinks
  fixin up them content types feature

sites/all/modules/better_exposed_filters/CHANGELOG.txt

@@ -4,6 +4,22 @@ Better Exposed Filters change log
 
 Better Exposed Filters 7.x-x.x  xxxx-xx-xx
 ------------------------------------------
+Issue #1240238 by marvil07, Max Ka, gapple, chichilatte: Let use toggle links on the exposed form sorts.
+by mikeker: Revamped automated tests.
+by mikeker: Fixed (most) Drupal Coding Standards errors and warnings
+Issue #1842494 by mikeker: Fixed Combined Sort Order - Rendered in Div of Submit Button.
+Issue #1784424 by mikeker: Refactored getting existing and default values.
+Issue #1666896 by Staratel: Fixed Filter captions on BEF settings form are empty if filter labels are empty.
+Issue #1798350 by mikeker: Fixed: secondary options were using the filter label instead of ID.
+By mikeker: Allow rewriting of filter values (similar to the rewrite combined sort option)
+Issue #1673562 by buzkall, nedjo: Added Automatically select children in nested checkboxes option.
+Issue #1813654 by elbahek, mikeker: Fixed Undefined offset notice on rendered page.
+Issue #1627524 by rooby: Added the jQuery slider widget to BEF.
+Issue #1873164 by mikeker: Fixed Taxonomy exposed filter links not linking to appropriate page.
+By mikeker: Correctly handle hierarchical taxonomy filters when rewriting filter options.
+
+Better Exposed Filters 7.x-3.0-beta2  2012-09-13
+------------------------------------------------
 Issue #975376 by mikeker, gordon: Inital port.  Note: only supports Views 3.x as there is no 2.x release planned for D7.
 Issue #1109950 by mikeker, Francois LR: Fixes errors in taxonomy tree
 Issue #1099528 by mikeker: Radio button labels not displayed
@@ -17,6 +33,25 @@ By mikeker: Added datepicker option
 Issue #1194102 by dj1999: Adds BEF options to 'is all of' filters
 Issue #1149254 by aaronbauman: Hides Apply button when exposed filters are set to hidden
 Issue #1227168 by gionnibgud: Adds IDs to select_as_links filter options
+Issue #1260194 by zhuber: Adds toggle functionality to filter links (added --author attribution in a later commit)
+Issue #1099528 by Murz: Fixes incorrect depth of '- Any -' option
+Issue #1241960 by mikeker: Fixes E_STRICT warning
+Issue #1217204 by mikeker: Fixes Undefined index errors when BEF settings page is raised as a standalong page
+Issue #1281348 by mikeker: form.js and collapse.js not being aggregated properly
+Issue #1272694 by samhassell and mikeker: correctly sets form-item classes for wrapper divs
+Issue #1290630 by d.clarke: Removes duplicated IDs from radio buttons
+Issue #1289370 by mikeker: Gets Datepicker working again. Note: needs to be added to behaviors.
+By mikeker: Added/Cleaned up highlight JS, moved datepicker JS to Drupal.behaviors
+Issue #1289370 by ducktape: Adds support for Drupal's default date field and corrects missing JS file
+Issue #1297418 by mikeker: Puts exposed operators inside fieldset
+Issue #1283998 by mikeker: Added token support in description fields
+Issue #1212744 by mikeker: Collapsible option for sort
+Issue #1398048 by mikeker: Rewritable combined sort options
+Issue #1439216 by KeyboardCowboy: Remove duplicate name attributes on checkboxes (W3C validation)
+Issue #1548292 by richard.thomas: Use drupal_add_library() for datepicker option
+Issue #1171952 by mikeker: Added single on/off checkbox support
+Issue #1286378 by m4olivei: Fixes link filter state being list when non-link filter is used
+Issue #1362344 by mikeker, arkz: Adds option to put exposed form elements in a secondary options fieldset.
 
 Better Exposed Filters 6.x-x.x  xxxx-xx-xx
 ------------------------------------------
@@ -33,4 +68,4 @@ mikeker: Adds nested list display for hierarchical taxonomy filters
 
 Better Exposed Filters 6.x-1.0  2010-05-25
 ------------------------------------------
-Initial release.  Supports Views 2.x and 3.x.
+Initial release.  Supports Views 2.x and 3.x.

sites/all/modules/better_exposed_filters/better_exposed_filters.css

@@ -13,3 +13,13 @@ fieldset.bef-select-as-checkboxes-fieldset.collapsed legend
 {
   position: relative;
 }
+
+/*
+ * Styles for the jQuery UI slider widgets.
+ */
+.bef-slider.ui-slider-horizontal {
+  margin-top: 6px;
+}
+.bef-slider.ui-slider-vertical {
+  margin-top: 12px;
+}

sites/all/modules/better_exposed_filters/better_exposed_filters.info

@@ -1,16 +1,15 @@
 ; $Id
 name = Better Exposed Filters
-description = Allow the use of checkboxes or radio buttons for exposed Views filters 
+description = Allow the use of checkboxes or radio buttons for exposed Views filters
 core = 7.x
 package = Views
 dependencies[] = views
-files[] = better_exposed_filters.module
-files[] = better_exposed_filters.views.inc
 files[] = better_exposed_filters_exposed_form_plugin.inc
-files[] = better_exposed_filters.theme
-; Information added by drupal.org packaging script on 2011-08-02
-version = "7.x-3.0-beta1"
+files[] = tests/better_exposed_filters.test
+
+; Information added by Drupal.org packaging script on 2014-02-13
+version = "7.x-3.0-beta4"
 core = "7.x"
 project = "better_exposed_filters"
-datestamp = "1312327014"
+datestamp = "1392255206"