local v1
fix commit

Conflicts:
	Calendar/Calendar/Calendar.pro.user
	Calendar/Calendar/calendar.cpp
	Calendar/Calendar/calendarunittest.cpp
	Calendar/Calendar/data.xls
	Calendar/build-Clalendar-Qt_5_0_1_msvc2010-Debug/debug/Calendar.exe
	Calendar/build-Clalendar-Qt_5_0_1_msvc2010-Debug/debug/Calendar.ilk
	Calendar/build-Clalendar-Qt_5_0_1_msvc2010-Debug/debug/Calendar.pdb
	Calendar/build-Clalendar-Qt_5_0_1_msvc2010-Debug/debug/calendar.obj
	Calendar/build-Clalendar-Qt_5_0_1_msvc2010-Debug/debug/calendarunittest.obj
	Calendar/build-Clalendar-Qt_5_0_1_msvc2010-Debug/vc100.pdb
clean branch