office - commit remaining changes
office - resolved the .dom.js conflict, due to mergin
a commit of home