.
.
.
Merge remote-tracking branch 'origin/master'

Conflicts:
	de.bwvaachen.beamoflightgame/src/main/java/de/bwvaachen/beamoflightgame/controller/SolverBuilder.java
	de.bwvaachen.beamoflightgame/src/main/java/de/bwvaachen/beamoflightgame/controller/impl/LightController.java
	de.bwvaachen.beamoflightgame/src/main/java/de/bwvaachen/beamoflightgame/logic/solver/AbstractSolver.java
	de.bwvaachen.beamoflightgame/src/main/java/de/bwvaachen/beamoflightgame/logic/strategies/TryAndErrorStrategy.java