Kommentiert
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ch/ffhs/view/TSVenera.java
Merge remote-tracking branch 'origin/master'
User - setPassword hinzugefügt