added progress bar
resolved conflict in project.js