update Gemfile for update process to rails 4
update application.rb
bundle update
update routes
update environment config
update named scopes
more updates to the Gemfile
update models and controllers for strong parameters
change before_filter to before_action
add haml-rails to Gemfile
add fixes for rails4, rails_admin and rich
change order of raw and truncate helper
Merge branch 'rails4'