Merge branch 'dev' of https://github.com/vakhalin/tripwithme into dev
edit migration