pom
Merge branch 'master' of https://github.com/Knorke/de.htwg.wzzrd.git

Conflicts:
	src/de/htwg/wzzrd/control/Wizard.java