Temporary fixes to make migrations work and server standup
Merge branch 'master' of https://github.com/mrBlackbull/toru