what
SD
done
Merge branch 'contentpage'

Conflicts:
	app/views/tissue_arrays/index.html.erb
	config/routes.rb
	db/schema.rb