Move string fields, get rid of hard-coded list of booleans.
Add test for serialize/deserialize.
Additional test coverage.
Update version of xblock.
Change to putting serialize/de-serialize directly in xml_module.
Be strict about ModelType expected types, rename Object as Dict.
Cannot set String field to a dict anymore!
Test cleanup.
Merge branch 'master' into feature/christina/unify-fields

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt
Merge updates.
Merge cleanup.
Merge cleanup.
Upgrade xblock version to get strict ModelTypes.
Merge branch 'master' into feature/christina/unify-fields
Update for ModelType ("Stringy" version) change.
Merge pull request #111 from edx/feature/christina/unify-fields

Move "stringy" functionality into xblock fields