Added delete button and fixed tableview cell bug
Merge remote-tracking branch 'origin/master'