merging last production tag

 into heroslider

merged cab.styles.r11

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Fixing up/down vote
adding hero slider, don't forget to move CSS into the SCSS files.
merging in last prod push
git won't ignore
Merge tag 'sf.displayissues.r35' into integration

Fixing up/down vote issue

* tag 'sf.displayissues.r35':
  Fixing up/down vote
maybe fixing the results list bug?
Merge commit 'jc.postwidget.r42' into integration
fixing results list, mk. 2
Merge commit 'jc.postwidget.r43' into integration
Merge branch 'integration' into displayissues

* integration:
  Switching brand class names on buttons in flagging modal.
  fix for profile nav broken links
  Splitting CSS and Sass files into brand-dedicated files and folders.
  JIRA PHP-583: Removing ribbons from logos
  Minor tweaks to addthis post-upgrade; some prep for switching to brand-dedicated css.
  fix for elipsis in front of screen name causing profile link to be home link
  Fix for post a question allowing spaces only
  Changed results list headers to sort category drop downs alphabetically, and the posts widget to sort user lists alphabetically by user_nicename
  Rolling addthis plugin back to 2.4.0
style changes for slider
Merge commit 'jc.heroslider.r02' into integration
Merge commit 'dc.ldap.r02' into integration
Merge commit 'jc.heroslider.r03' into integration
fixing broken html
Finally fixing JIRA 605
Merge tag 'sf.displayissues.r36' into integration

Fixing JIRA-605

* tag 'sf.displayissues.r36':
  Finally fixing JIRA 605
  git won't ignore
consolidating CSS into scss files
Merge commit 'jc.heroslider.r04' into integration