Merge branch 'integration' into development
Fixing conflict
Merge commit 'sf.displayissues.r03' into development

* commit 'sf.displayissues.r03':
  removing echo
Merge commit 'comm.20120926.r37' into development

* commit 'comm.20120926.r37':
  Fixing issues
  Reverted date/time display changes on qa list
  Implemented user location functionality into SSO plugin.
  modifying the navigation menu so that it generates the links using the post type endpoint for pretty permalinks
  modifying rewrite rules to accept post type endpoints on category archives
  modifying the sections class to handle post type endpoint selection
  adding new metabox to sections for post type endpoint specification
  adding checkbox to dropzone interface that adds .border-left class to dropzones inner wrapper on the front end
  standardizing the elements used for wrapper markup on widget lists
  changing the ol/section crap in the widget header/footer partials
  minor update to dropzones front end display function
  Fix for login page error issue; split of date and time on qa results list
  fixing busted pagination on post-widget widgets
Merge commit 'sf.displayissues.r04' into development

* commit 'sf.displayissues.r04':
  Fixign PHP-213
Merge commit 'sf.displayissues.r05' into development

* commit 'sf.displayissues.r05':
  Fix for JIRA PHP-240
Merge commit 'comm.20120926.r38' into development

* commit 'comm.20120926.r38':
  Issues with submodules
  Overhauling fonts.
  Modified about me on profile page to show user location if set.
Merge commit 'sf.displayissues.r09' into development

* commit 'sf.displayissues.r09':
  Fixing issue PHP-279 as i didn't have the change in there
  Fixing issue PHP-279 as i didn't have the change in there
  Fixing following issue where following is displaying when user is not following
  Fixing Eddie's plugin
  Removing unnecessary echoes
Merge commit 'sf.displayissues.r10' into development

* commit 'sf.displayissues.r10':
  Fix for JIRA PHP-215
  Fixes for styling issues inside of infoBubbles
Merge branch 'widgetpress' into development
conflict resiution
Style and HTML overhaul
Merge commit 'widgetpress.em.r11' into int_pre_clear

* commit 'widgetpress.em.r11':
  hopefully this will obliterate the fucking russian roulette bug - in part because its important, but mostly because im tired.
  updating widgetpress to remove post type archive checkboxes
  implementing a dirty as shit widget migration script
  truckfuck of images
fixed merge conflicts
Merge commit 'com.ipc.20120926.r01' into development

* commit 'com.ipc.20120926.r01': (40 commits)
  hopefully this will obliterate the fucking russian roulette bug - in part because its important, but mostly because im tired.
  updating widgetpress to remove post type archive checkboxes
  implementing a dirty as shit widget migration script
  truckfuck of images
  Resolving more roll backs of submodules
  Fixed fatal error in template-tags.php
  added comments to state abbr in user_location
  Added state name to two letter abbr functionality for user_locations
  fixing result list category link
  Added CSAT check on register page for email & zipcode
  user sorting in results list
  Fix for expert role query in multisite
  increasing the character limit of the excerpt
  sorting navigation
  testing screen name test issue.
  JIRA-PHP286 fixing class typo to style correctly.
  trying to destroy the fucking russian roulette bug
  removing filter when no results are found on the search page
  reordering share buttons
  fixing comment type issues - apparently triggered by a filter on comment data not returning stuff
  ...
Fixing conflicts
Updating wp-dropzones
Updating image widget
merged
Merge branch 'development' of https://github.com/dasfisch/communities into development