Upgrading Rails 4
Merge branch 'master' of github.com:migmartri/emberjs-testapp-foodordering