.
Merge branch 'master' of https://github.com/JKayse/Caterva
Worked on the list view of events, the view event description, and the edit events.