data folder changes
local changes on Victor's
Merge branch 'dev' of github.com:vstarostenko/soteria into dev