Fixed conflict
Updated the base font size to 13px.
another fix for two word states
Merge remote branch 'origin/integration' into login
Fixing profile editing url, merged with Tim's css fixes, fixed social icons in footer, fixed meet the team, fixed footer hover state.
truckfuck of images
implementing a dirty as shit widget migration script
updating widgetpress to remove post type archive checkboxes
hopefully this will obliterate the fucking russian roulette bug - in part because its important, but mostly because im tired.
Fixes for ts.pen15.r07 and more style fixes/bug fixes
Merged with Carl's cab.comments.r09
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
JIRA-PHP187 implementing link from Shyam for profile linking.
fixing the body container css class on the image widget
Created Page Title Header Widget
More changes to styles, added styles for page-title widget
header widget
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