projectController done except member part
Merge branch 'master' into projectcontroller