drag_and_drop template added
updated imageresponse example to a more universal example (baby animals)
removed soon-to-be-universally-fixed defaults
removed uneeded defaults from imageresponse
merge conflict
Install: Fixes "Don't know how to build task 'cms:update_templates'"

Remove the `update_templates command from the installation script, this
command was removed by
https://github.com/edx/edx-platform/commit/3722685e1a185ff4a0a085bb380ed793cf6d1e59
Merge pull request #431 from antoviaque/updatetemplate-notfound

Install: Fixes "Don't know how to build task 'cms:update_templates'"
fix test to use the new create_item method rather than clone_item, which has been deprecated, and thus breaking the test
Merge pull request #404 from edx/lyla/templates

Adding a template for drag-and-drop.
remove the video from the toy course for now as the import-export-import isn't totally equivalence.
Merge pull request #425 from edx/fix/cdodge/exporting-video-modules

Fix/cdodge/exporting video modules
Merge branch 'master' of github.com:edx/edx-platform into feature/kluo/bulk-email
Merge branch 'feature/kluo/bulk-email' of github.com:edx/edx-platform into feature/kluo/bulk-email
Make emails per task configurable