Support solution in the shape of html texts instead of videos
Support text solutions in teacheradmin
Some usability improvements in teacheradmin questions interface
Don't return the solution text for exams or homework before the deadline
Add a new field feedback to options model
Merge branch 'master' into feature-solution-feedback

Conflicts:
	moocng/locale/es/LC_MESSAGES/django.mo
	moocng/locale/es/LC_MESSAGES/django.po
	moocng/static/js/teacheradmin/units-views.js
Resume migrations in one
Support feedback in question editor
Always show the link to the question editor in django admin

Since we have now the "no-image" image and the blank canvas.
Paint feedback button next to wrong options
Improve feedback button style
Improve question editor styles
Make the solution video the default for new questions
Force fixed height and scroll on text solutions
Update translations for feedback and text solutions
Merge branch 'feature-solution-feedback'