Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

add django performance metering

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info

Conflicts:
	lms/djangoapps/courseware/module_render.py

Feature/alex/doc

add doc file about use of mongo (by cms+lms)

merge to master

debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.

Remove openings from job page

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting

Use one of our test courses when testing course permissions for the discussion client

Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides.

Fix a bug with pointer-tag detection on load

if a tag has text but no children, wasn't properly detected as an inline definition.

Remove learning designer and producer openings from job page

Fixed install by adding mysql

fixed typo

More inputtype refactor …

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/mongo-perf-instrumenting

Conflicts:
	requirements.txt

- change a few comments / strings
- move extract_choices into the ChoiceGroup class

Fix alex vsepr 2 mitx

add to existing test cases to exercise the 'course extras as modules' work in the CMS import. Also add to the existing 'full' test data collection to include policy, tabs, etc.