Add video in place
Merge branch 'master' of github.com:drlippman/IMathAS

Conflicts:
	imascore.css
	javascript/general.js
Bug fix not checking if outcomes was defined in POST
bug fix videoembed and content track not waiting for domready
Merge branch 'master' of github.com:drlippman/IMathAS
Bug fix image urls on email send not absolute urls.
Bug fix calendar display with quotes in tags
Bug fix stuanswersval not populated for conditional questions
Merge branch 'master' of https://github.com/drlippman/IMathAS