aloha-editor added
conflict resolved
overlay added for inserting images through editor
overlay added for inserting images through editor
conflict resolved
conflict resolved
calendar listings done
conflict resolved
Merge branch 'mongokit' into events
bug in image overlay resolved
conflict resolved
time based view setuped for events
time view added to task
variable names changed
bug resolved in add images through overlay
Merge branch 'mongokit' of https://github.com/gnowledge/gstudio into mongokit
Merge branch 'events' into mongokit
Merge pull request #899 from supriyasawant/mongokit

Bug resolved in adding images through overlay.
Listing query modified(Gettin name, gender, dob, emailid); & passing additional context variables for VT & MT
Listing-view updated (Columns list updated): Name, Gender, Birth date, Email ID, Edit button & Delete button