save data in db now works fine
Merge branch 'dev'