NON WORKING COMMIT!!! USE PREVIOUS OR FIX ERRORS!!!
Merge branch 'master' of https://github.com/chriser-/planspiel2014