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.