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

Fix/vik/remove mitxmako

Add MySQL-Python back in for AWS.

While this is a pain for content developer local environment updates it breaks the LMS in EC2 which is vastly more important.  We'll jsut have to address helping individual content people with installing MySQL if needed. This is a real dependency in production and I think those belong in here.

Feature/christina/tiny mce

Bugfix/brian/pearson reg

disable caching in draft mode stores. It doesn't behave as we expect and...

Change the div being used to create code mirror to a textarea-- just make sure to escape the content! Update tests accordingly.

disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate

Update content: FAQ, help page and front page video

Hotfix/alex/gst

Escape text being passed to markdown editor, delete copied (and unused) JS code

pearson registration - removed telephone/fax placeholder attributes since they can't represent both domestic and international formatting easily

[#154]

Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt

Fix/cdodge/filesystem xml fixes

pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections

Added 2 new instructor tools