Small changes to xblock for better lms integration
Merge branch 'master' into sanchez/xblock_lms_integration

Conflicts:
	apps/openassessment/xblock/openassessmentblock.py
Updating all the defaults on the xblock
Removing html tags from prompt
Small changes based on code review
Merge pull request #35 from edx/sanchez/xblock_lms_integration

xblock lms integration for TIM
Merge branch 'master' into sanchez/template-first-crack

Conflicts:
	apps/openassessment/xblock/openassessmentblock.py
Updating code based on merging master.
Renamed all Evaluation to Assessment (except models). Some refactoring to begin the UI work