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

Conflicts:
	power_capturelyseBeans/ejbModule/sessionBeans/EnergietypVerwaltungBean.java