EnergietypVerwaltung neu
jre system library
Merge branch 'master' of https://github.com/faryu/power-capturelyse

Conflicts:
	pcl-web/.classpath
Rest testing update
merge