Updated new styles or resource index pages and upgrade to Rails 4.0.4
Resolved merge conflicts