Add an apostrophe to the Lorem text.
Fix single-quoted translated strings to be double-quoted.
Disabled video updateplaytime JS test
Merge pull request #2139 from edx/ned/add-apostrophe-to-lorem

Add apostrophe to lorem and fix single-quoted strings
Merge pull request #2161 from edx/will/disable-more-video-tests

Disabled video updateplaytime JS test
Revert "small bugfixes for theming+sass+templates"

This reverts commit 5f3313ece467a537b67af1aed9189af220308cb8.
Merge pull request #2162 from edx/jbau/sass-path-bugfix

Revert "small bugfixes for theming+sass+templates"
Remove references to old university images
Merge pull request #2158 from edx/sarina/remove-university-refs

Sarina/remove university refs
Clean up some pre-existing formatting.
Remove unused things.
Rename DbModel to KvsFieldData.
Implement InheritanceFieldData
Use XBlock xml serialization and deserialization

XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]