ProjectManager, fixes
Merge pull request #493 from onepercentclub/feature/ProjectManager

Feature/project manager