corrected Fritzs weight
updated public energy API for proper use in Application
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client