Copying changes from server
Merge branch 'dev'