add 'more artists' link to artist search page
fix unclosed div that was breaking the tabs.
Merge branch 'master' into design130808
fix a mistyped div tag.
Merge branch 'upstream/master'

Conflicts:
	app/views/users/show.html.erb