stop
stop
Merge branch 'master' of https://github.com/ccclxv/GodvilleUI

Conflicts:
	builder/build.js
	builder/build.sh
	firefox/chrome.manifest
	firefox/content/gm_func.js
	firefox/content/loader-overlay.xul
	firefox/content/loader.js
	firefox/install.rdf