Genrestuff
Merge branch 'master' of https://github.com/Asmayra/SoPra.git

Conflicts:
	SoPra/src/main/java/org/control/DiscoverControl.java
	SoPra/src/main/java/org/control/listener/MoreDiscoverButtonListener.java
Merge branch 'master' of https://github.com/Asmayra/SoPra.git