removed app/metal folder as metal is deprecated and could not find any references to files contained
Updated old references to ApplicationMailer to the new UserMailer class
Added factory_girl_rails gem
require 'test_help' changed to require 'rails/test_help'
Merge branch 'rails3' of https://github.com/myGrid/biocatalogue into rails3
Added factory_girl_rails gem
removed action_controller from config.action_controller.consider_all_requests_local
Merged Gemfile.lock