refactored
removed cache
refactored
upgraded to rails 4
Merge branch 'upgrade_rails_4' into development