fixed date.h merge, weekday in gregorian.cpp works