JUnit tests for Energy Class
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client

Conflicts:
	nEVERrEST/app/src/main/java/de/ferienakademie/neverrest/model/Energy.java
Merge branch 'master' of https://github.com/Maddoc42/Ferienakademie2014Client