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.
adding hero slider, don't forget to move CSS into the SCSS files.
merging in last prod push
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
Added location update on login
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
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
Moving registration form into partial; updating page-register; creating page-register-qualtrics
Ignoring conflict as file will re-render
Fix for PHP-612