ghjkl
Merge branch 'master' of github.com:LeBoozer/Calendar

Conflicts:
	Calendar/obj/Debug/Calendar.csproj.FileListAbsolute.txt
	Calendar/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of github.com:LeBoozer/Calendar

Conflicts:
	Calendar.v11.suo
ansichten für Termin und Aufgabe erstellen erstellt
Fenster Appointment / Task in richtiger größe
Merge branch 'master' of github.com:LeBoozer/Calendar

Conflicts:
	Calendar.v11.suo
	Calendar/Windows/AppointmentWindows.cs
	Calendar/Windows/TaskWindows.Designer.cs
	Calendar/Windows/TaskWindows.cs
	Calendar/bin/Debug/Calendar.exe
	Calendar/bin/Debug/Calendar.pdb
	Calendar/obj/Debug/Calendar.csproj.GenerateResource.Cache
	Calendar/obj/Debug/Calendar.exe
	Calendar/obj/Debug/Calendar.pdb
Projektstand zusammengeführt