fixed rails 4.0.2 mime-type dependency conflict
Merge branch 'rails4'