calendar listings done
conflict resolved
Merge branch 'mongokit' into events
time based view setuped for events
time view added to task
variable names changed
Merge branch 'events' into mongokit
Conflicts resolved with commit #899.
Merge branch 'makfire-mongokit' into mongokit