added edit button
created new json fake data
addEvent work in progress
merged conflicts
added data to db and added 'note'