Started working on issues regarding editing/saving at the same time.
Fixed edit/delete bug, fixed various Firefox bugs.
Merge branch 'functionality-refactoring' into develop