ErkansMergeShit
Merge branch 'master' of https://github.com/Kadrei/SerienCalender-Client

Conflicts:
	.classpath