Feature/update to rails 4

update from Rails 3.2 to Rails 4.0.1