Merge branch 'master' of https://github.com/faryu/power-capturelyse

Conflicts:
	power_capturelyseBeans/ejbModule/entity/Zaehler.java
	power_capturelyseBeans/ejbModule/sessionBeans/VerbrauchVerwaltungBean.java
Merge branch 'master' of https://github.com/faryu/power-capturelyse
Merge branch 'master' of https://github.com/faryu/power-capturelyse
.