Merge branch 'dev' of github.com:mbret/jenseits-von-theben into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.form
	src/main/java/com/miage/gui/PanelHome.java
	src/options.ini
sound fixed
Merge branch 'david' into dev

Conflicts:
	src/main/java/com/miage/gui/PanelHome.form
	src/main/java/com/miage/gui/PanelHome.java
option ini fixed
fixed sound 2