Fix in Project Class
Merge origin/master
Fix in Project Class
Merge origin/master
Fix in Project Class
Merge origin/master
Fixing New Project