Merge pull request #409 from edx/sanchez/xml-validation-refactoring

Split XML serialization and validation contracts.
Merge pull request #429 from edx/sanchez/include_prompt_flag

Sanchez/include prompt flag