fertig für heute
Merge branch 'master' of https://github.com/pwitoschek/pd.git

Conflicts:
	pd/src/main/java/de/app/pd/entities/pv/Tagesertrag.java
Merge remote-tracking branch 'origin/master'