[Sandeep] -  Use FactoryGirl in upload_controller_spec and fixed the data issue; test will still fail due to application defect
Merge branch 'master' of https://github.com/anandbagmar/tta