Fixed some issues from after merge; moved generic object modification modal to root base.html for use in frontend and backend
Merge event create/update