Event adding and table updates on event add as well as merge conflicts in mainstoryboard fixed