minor fixes
Merge branch 'seth'

Conflicts:
	app/views/tables/_table_table_partial.html.erb
minor changes