First changes for rails 4.0.0.beta1 support
Merge branch 'master' into rails4
Merge branch 'master' into rails4
Merged from master
Merge branch 'master' into rails4
Put sass-rails and coffee-rails version back
Change coffee-script and sass gem version
Upgrade to rails 4.0.0.rc1 and remove assets group from Gemfile
Merge branch 'rails4'