fixed changes saving
Merge branch 'develop'