Preparing the merge...
Merge branch 'master' of github.com:wiredearp/spiritual-gui

Conflicts:
	src/modules/core.module/plugins/dom.plugin/gui.DOMPlugin.js
Key module.
Merge pull request #51 from wiredearp/master

Key module.
Merge branch 'master' into 0.0.4-ts
Pommelom!
Merge branch '0.0.4-ts' of github.com:Tradeshift/spiritual-gui into 0.0.4-ts