Squashed commit of the following:

commit 1431d24473e562891ee7a413c7ddac6ed2d0d377
Author: Walfischfutter <tomas.bayer@fu-berlin.de>
Date:   Sun Mar 17 21:33:13 2013 +0100

    fixed issue #57

commit 3dbb7170ed0419eee3cc55c9348e065ed0ccf3a4
Merge: 836e51d 8facf33
Author: Walfischfutter <tomas.bayer@fu-berlin.de>
Date:   Fri Mar 15 22:12:35 2013 +0100

    Merge branch 'master' of https://github.com/swp-sebastian/zombiefu

commit 8facf33bf9509c798e881d5afec084fa880f7a33
Author: Sebastian <sgs@zedat.fu-berlin.de>
Date:   Fri Mar 15 21:46:57 2013 +0100

    break aus ZombieSettings entfernt.

commit 836e51da2a0760366252aa281b0888b12b76cdaf
Author: Walfischfutter <tomas.bayer@fu-berlin.de>
Date:   Fri Mar 15 20:59:10 2013 +0100

    Revert "Reihenfolge der Konfigurationsdateien geändert."

    This reverts commit 248ed01393cc36d0b9ee4d370f0cb4b33c9ac6c7.
Merge branch 'master' of https://github.com/swp-sebastian/zombiefu
Merge branch 'master' of https://github.com/swp-sebastian/zombiefu

Conflicts:
	src/zombiefu/util/ZombieSettings.java