Migration fixes. Screen edit simple fix.
Merge branch 'master' of github.com:s1mplex/booking