fixed migration problem
Merge branch 'master' of https://github.com/marcusshepp/five-oh