Added edit and delete functions
Added JSON functionality
Merge remote-tracking branch 'origin/Development' into Development