merge from topgun master
Add functionality for project removal
Fix merge conflicts
Merge branch 'mike'