Fix for resources not showing properly
Fix for resources and non-working comments
Fix long comments, url height
Fix view scripts, profiles2
Fix comments
Fix HTML not viewing
Fix delete not redirecting
Graphical fixes, new collection UI
Merge branch 'ui-fixes' into HEAD

Conflicts:
	app/views/collections/_collection.html.erb