Fixup
Merge branch 'master' of github.com:robotbrain/quickmods

Conflicts:
	fabricator.dev.json
	fabricator.json