[closes #31] Merge branch 'law-crud' into develop