migration fix
Merge branch 'dev' of https://github.com/us4us/seed into dev