before prod.
Merge branch 'master' of github.com:Mohamed5amy/tms
homepage members
Merge branch 'master' of github.com:Mohamed5amy/tms

Conflicts:
	app/assets/stylesheets/homepage.css.scss
	app/views/application/homepage.html.haml