Merge branch 'master' of https://github.com/edx/edx-platform
beginning to write test code: checking the XML manipulation as it is prepared for student view