Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py

Feature/cas/tom/section details

changed save button to add user

trim section name strings to remove whitespace

have import be a bit more flexible in terms of the packaging of the cont...

have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder.

new saving conventions

Victor/test speedup

fixed tabindex

Add fix for users with multiple licenses

Use test database in licenses test instead of 6.002x

remove cut/paste error which results in a server error.  is not defined ...

remove cut/paste error which results in a server error.  is not defined when there are no assets. Also fix up base.js to only register one set of handlers for file section which gets rid of the multiple file selection dialogs from appearing

catch when users empty out a section name. don't allow them to do that.

Fix/cdodge/pre push tweeks

replaced DateJS with latest version from their repository. There was a known bug about parsing times that are 12:xxPM - believe it or not.

Catch unicode errors in contextualize_text and deal with them.