finish members and comments
Merge branch 'master' of https://github.com/mohamed5amy/tms

Conflicts:
	app/assets/javascripts/projects.js