Merge pull request #111 from edx/feature/christina/unify-fields

CHANGELOG.rst

...jangoapps/contentstore/features/advanced-settings.feature

cms/djangoapps/contentstore/features/advanced-settings.py

cms/djangoapps/contentstore/features/problem-editor.py

cms/djangoapps/contentstore/tests/test_checklists.py

cms/djangoapps/contentstore/views/course.py

cms/xmodule_namespace.py

common/lib/xmodule/xmodule/abtest_module.py

common/lib/xmodule/xmodule/capa_module.py

common/lib/xmodule/xmodule/combined_open_ended_module.py

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/fields.py

common/lib/xmodule/xmodule/peer_grading_module.py

common/lib/xmodule/xmodule/poll_module.py

common/lib/xmodule/xmodule/tests/test_fields.py

common/lib/xmodule/xmodule/tests/test_xml_module.py

common/lib/xmodule/xmodule/word_cloud_module.py

common/lib/xmodule/xmodule/xml_module.py

common/test/data/full/course.xml

lms/xmodule_namespace.py