Merge branch 'editor-update' of git@github.com:infraling/atomic into
editor-update

Conflicts:
	de.uni_jena.iaa.linktype.atomic.model.salt.editor/src/de/uni_jena/iaa/linktype/atomic/model/salt/editor/palette/AtomicEditorPalette.java

	close #8
Revert "Fix #8: Create drawers for different tools (http://github.com/infraling/atomic/issues/issues/issue/8)"

This reverts commit dde7a20935c61891893701c01e797cecba1ecf3c.