Conflicts:
	rakefile

Feature/ned/quieter tests

Put the coverage data files in the reports dir, where they will be treated like the disposable things they are.

Split out requirements that come from the local mitx repo and those that come from github, and upgrade the local requirements before running tests

Feature/cale/js tests

Fix/cdodge/delete last component does not stick

Simple Pearson Testing

Add support for subtitle download link

Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly.

Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next.

Taking out MySQL-python for now because it requires mysql to be installed, so breaks updates on content folks' envs.

implement importing of course info sections as modules in the course

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

remove explicit 'null' for child collection on saveName on unit code paths. I had seen cases where save was posting back an empty set on renames - deleting the components. But I can no longer reproduce it now.

Re-add TestCenterUser along with a basic command to make an entry for a given user already in the system.

add django performance metering

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/delete-last-component-does-not-stick

revert to using getElementsByClassName in .dialog b/c jQuery was

undefined on the content passed in & whole widget is disabled in ie8.