Status reports kinda displayed in files

stored in files in a folder created at project creation for all projects
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/controllers/team/teamCtrl.js