Unit drag and drop works correctly now.

Conflicts:
	cms/static/js/base.js
	cms/static/js/hesitate.js

Feature/cdodge/cms master merge4

Quick fixes to self assessment tests

Conflicts:
	common/lib/xmodule/xmodule/course_module.py

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

fix tests--nosetests is overly excited about my code

Sort courses by announcement date

fix bug in instructor dashboard groups code

Need path to tiny mce JS file now.

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

Conflicts:
	jenkins/test.sh

studio - adding in LMS synced styles for TinyMCE WYSIWYG preview

Removed editor type icon/text from all component sub menus except problem

only cache discussion forum info for 5 minutes before flushing. This is ...

only cache discussion forum info for 5 minutes before flushing. This is needed for Studio backed courses that can add new discussion items at any point in time. Also we need to also set metadata fields (which are basically the same as what gets passed in the XML) as the forums expect those values as metadata

If there is no announcement date (in the policy metadata) then use a
heuristic to sort them.

If there is an announcement date, the use it in the heuristic to
determine if the course is new or not.

Feature/christina/tiny mce

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

Fix/vik/remove mitxmako