be picky about x as marker for correct requiring it to be first
non-whitespace char on line, followed by whitespace, followed eventually
but another non-whitespace char
 	strip trailing newline from selection.

in the model as well as the ancillary info

Set up the framework for running lettuce tests against studio

Fix iframe conversion problem (111)

add required video setting

Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee

make sure we turn off module wrappers for the 'ancillary' course content