ich habe keine ahnung was ich hier gemacht
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client