med comentery
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/CALENDAR.v12.suo
	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/CALENDAR/bin/Debug/CALENDAR.exe
	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/CALENDAR/bin/Debug/CALENDAR.pdb

	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/ComponentTesting/bin/Debug/CALENDAR.exe

	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/ComponentTesting/bin/Debug/CALENDAR.pdb

	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/ComponentTesting/bin/Debug/ComponentTesting.dll

	Assinments/Pebj_Smot_AS.43_v4/CALENDAR/ComponentTesting/bin/Debug/ComponentTesting.pdb