changes to registration on qualtrics page
Finish up Qualtrics registration page
fixed merge conflict in wp-config.php
Qualtrics final change
Merge tag 'ts.qualtrics.r02' into integration

Let's do this again. Final changes.

* tag 'ts.qualtrics.r02':
  Qualtrics final change
removing console calls
versioning up the hero slider javascript file to keep people from having to clear their cache
Merge tag 'jc.heroslider.r07.1' into integration

versioning up the hero slider javascript file to keep people from having to clear their cache

* tag 'jc.heroslider.r07.1':
  versioning up the hero slider javascript file to keep people from having to clear their cache
  removing console calls
Merge tag 'comm.20130129.r01' into integration

Merging ts.qualtrics.r02

* tag 'comm.20130129.r01':
  Qualtrics final change
removed exception when location data not found to fix issue that a new ldap user was experiencing
Merge commit 'dc.ldap.r03' into integration
merging in last production push
updating image widget version
merging last major change

03' into grassy-knoll

adding imagewidget changes to communities

# 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.
category awareness enqueued assets
changes are being retarded, pulling down