Model/ViewModel/Security layer post-refactor debugging
Merge branch 'dev' into model
update database content and connections