Kleinere Anpassungen am Formatter und Code reformatiert
Merge branch 'master' of https://github.com/doc-brown/AndrVoc

Conflicts:
	.settings/org.eclipse.jdt.core.prefs