small changes
Merge branch 'master' of https://github.com/fx-l/de.htwg.modprog.cubic

Conflicts:
	src/main/scala/de/htwg/modprog/cubic/model/impl/CubicBoard.scala
Merge branch 'master' of https://github.com/fx-l/de.htwg.modprog.cubic

Conflicts:
	src/main/scala/de/htwg/modprog/cubic/model/impl/CubicBoard.scala