Merge pull request #76 from FWAJL/master

Master to DEV
Update project_manager.js
Merge pull request #77 from FWAJL/Development

Development