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