refactoring
Merge branch '2.2.0' of github.com:svenkubiak/Rudeltippen into 2.2.0