Added migrations needed for basic functionality
Merge branch 'f-migrations-1' into develop