Conflicts:
	cms/static/sass/_assets.scss
	cms/static/sass/_base.scss
	cms/static/sass/_unit.scss
	cms/templates/unit.html

trigger another build

another comment commit just to trigger a new build

studio - resolved overflowing images in unit editing

basically force another build by adding a comment

add a comment. Namely we just want to trigger another build.

add forgotten new file

Fix/cdodge/handout links

Feature/cdodge/export

append some character, in this case a '_', if the course number is reall...

add service entry point to generate tar.gz file and return to caller. Use of the NamedTemporaryFile will auto cleanup.

Conflicts:
	common/lib/xmodule/xmodule/contentstore/content.py
	common/lib/xmodule/xmodule/contentstore/mongo.py

fix up some thumbnail issues. Also we need to manage the user permission...

Got settings details unit tests to invoke the view handlers

along.

fix command error message. There are really only two arguments supported (the optional 6 had been removed, but I forgot to change the message

fix up some thumbnail issues. Also we need to manage the user permissions when we clone and delete course

Bug/dhm/dec12

plus commented out failing unit tests until I can get someone to help
debug them.