Merge branch 'tool-editor' of https://github.com/chipster/chipster.git i...

...nto tool-editor