projects
Merge remote-tracking branch 'origin/master'

Conflicts:
	tsa/app/views/projects/index.html.erb