updated rails
Merge branch 'master' of github.com:tienyuan/open-todo into upgrade-rails
Merge branch 'master' of github.com:tienyuan/open-todo into upgrade-rails
Merge branch 'master' of github.com:tienyuan/open-todo into upgrade-rails