Concept XBlock prototype
Merge
Merge pull request #3057 from edx/pmitros/concept-xblock-prototype

Concept XBlock prototype

Test environment taking a little longer than expect. Jarv said okay to merge, so merging,