Added clendar
Merge branch 'master' of https://github.com/cipinutescu/adt74

Conflicts:
	CPA/CPA/CPA.csproj
	CPA/CPA/bin/Debug/CPA.exe
	CPA/CPA/bin/Debug/CPA.pdb
	CPA/CPA/obj/Debug/CPA.csproj.FileListAbsolute.txt
	CPA/CPA/obj/Debug/CPA.csproj.GenerateResource.Cache
	CPA/CPA/obj/Debug/CPA.csprojResolveAssemblyReference.cache
	CPA/CPA/obj/Debug/CPA.exe
	CPA/CPA/obj/Debug/CPA.pdb