playing with edit function
fixed edit and delete functions
Merge branch 'refs/heads/Development' into gh-pages