Feature/merge master to develop

-  Merge master to develop
-  Fix migrations