Fixed merge accident and show now some details about challange
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client