Merge branch 'dev' into form_io, bugs on backend