Improved soft-delete implementation
Merge branch 'mvc-school-initial' into dev