Moved UserPreferences to common
Merge pull request #2405 from edx/ned/remove-massemail

Remove unused massemail commands.
Replace rake functions with python paver functions
Deprecated rake functions issue a warning and then call paver
replacements

Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
First rough cut of a container page.
Couple more changes
updated container header styling and exposed sidebar back to its location. includes some javascript to render tooltips on overflowed text headers
Merge pull request #2520 from edx/will/paver-rebase-part-1

Paver (Part 1)
styling for recursive xblock rendering structure to be used in the container page, pulling from general xblock styles in a separate file.
Add "Additional Transcripts" section to Video topic
Merge pull request #2507 from edx/marco/studio/container-view

styling for a generic container view in Studio built on top of base styles for xblocks rendered in Studio. Also includes UX reference template area for unit and container pages.
Fixed broken image in LTI Component topic
Clarify one advanced setting for video components
Merge pull request #2604 from edx/sylvia/documentation/BLD-841

Fixed broken image in LTI Component topic
Merge pull request #2606 from edx/release

Hotfix for Feb 14 2012
Revert "Replace rake functions with python paver functions"

This reverts commit df2e410f2a8ca8ceeebfc7dc665a9f731ea3884c.
Merge pull request #2609 from edx/will/revert-paver

Revert "Replace rake functions with python paver functions"
Merge pull request #2605 from edx/sylvia/documentation/BLD-837

Sylvia/documentation/bld 837
Changed scrollbar to playback bar per Carlos
Update change log
Added change log for the Data Formats part of the guide