added test case for energy class
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Server