Fixed event saving bug
Fixed some conflicts from merging dev in