resolve conflicts on rebase
resolve conflict on rebase (import)
keep 'data' field updated with content related to 'items' field (CourseInfoModule)
STUD-154
resolve conflicts on rebase
some cleanup
STUD-154
code cleanup/update
STUD-154
resolve conflicts on rebase
update course info updates save method
STUD-154
update _load_extra_content method to properly save content fields
STUD-154
make contructing and saving xblock independent for json and html/xml files
STUD-154
some update/cleanup
remove extra code
user modulestore's method 'create_and_save_xmodule' instead 'construct_xblock'
STUD-154