Project editing hotfix

Martin Mladenovrequested to merge
600-autosave-overwrites-project-edits into master

This MR merges the fixes for #600 (closed) and #601 (closed) into master.

Edited by Martin Mladenov

Merge request reports