Fixed Vendors links from logos on home pages
Removed Recorders links from home page
Recorders link put back
Fixed
Fixed recorder and awt
Revert "Fixed"

This reverts commit d999ca49f0ec08cc237b318306cd322ac0a425d0.
Resolved conflicts:
	lib/tasks/import_data.rake
Import S3 data
Test
Reverted test chagnes to header
Merging master to import_images
Merge branch 'master' into import_data