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