Migrations needed to be re-ordered cause the Parents model was
completely changed
Merge branch 'develop'