Web:  Index page -FINAL -
Web:  Index page -FINAL -
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/affiliates/show.html.erb
	app/views/agreements/_agreement.html.erb