upgrade to rails 4
removed extra files
prepare to merge with Rails 4
Rails 4 merge success