Conflicts:

	lms/templates/staff_problem_info.html
	lms/xmodule_namespace.py

Remove duplicate entries from the press page.

Studio Help Sock

Fix pg progress

pylint/pep8 fixes

Feature/cdodge/integrity check mongo course

Instrument studio for analytics

add dump of description of grading configuration to instructor dashboard

Hotfix/gprice/marketing changes 20120404

Requested by Conrad via email

add default message to conditional

Show course end date on course about page

Conflicts:
	cms/envs/common.py

#224

#224

Merge branch 'feature/btalbot/studio-helpsock' of github.com:MITx/mitx into feature/btalbot/studio-helpsock

#224

Stanford press release

fix IntegrityError duplicate entry issue with module_data Scope.student_state update

clean up xqueue callback url generation; allow override from settings

Tests to make sure that input_states have the correct keys

fix lms migration to be compatible with xblock

Lighthouse ticket [#328 state:resolved]

Lighthouse ticket [#304 state:resolved]

Lighthouse LMS tickets:
[#307 state:resolved]
[#310 state:resolved]
[#319 state:resolved]
[#322 state:resolved]