Tool editor text editor and parsing refactoring
Added test-output to ignore
Merge branch 'master' of https://github.com/chipster/chipster.git
Merge branch 'master' into data_beta

Conflicts:
	.gitignore