fixing migrations
Merge branch 'develop' of https://github.com/implacable/projectManager into develop