bug fix

GregorianCalendar type conflict
week view date controller reference conflict
sth else