expanding draggable/droppable
Merge branch 'chris'
A ton of fixes related to adding a component/plaintext view to the syllabus
Merge branch 'master' of https://github.com/gwillad/syllabest

Conflicts:
	app/assets/javascripts/backbone/views/syllabuses/show_view.js.coffee
	log/development.log
remove merge conflict for real
remove alert
Improvements to error message display, fixed bug with errors being repeated on the screen as you continually hit submit