add google calendar
fix
add views for calendar
merge