edit/delete functionality in place
Merge branch 'master' of https://github.com/alonecuzzo/ios-10k