allow parameters in registration step, correct misspelling
Merge branch 'master' into rails-4

* master:
  allow parameters in registration step, correct misspelling