git won't ignore
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
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