added .log to gitignore
rework layout of SettingsPanel
update SettingsPanel layout
Merge branch 'master' into dev

Conflicts:
	doc/bytecode_robert_eike/Example.java
	doc/bytecode_robert_eike/Example2.java
	doc/bytecode_robert_eike/Summary.txt
	doc/bytecode_robert_eike/fu-beamer-template.tex
	doc/bytecode_robert_eike/main.tex