fytyty
Merge remote-tracking branch 'origin/master'

Conflicts:
	MedikZeit/app/models/User.java
	MedikZeit/eclipse/classes/.gitignore
Merge remote-tracking branch 'origin/master'