fixed getallprojects function
fixed merge conflicts