1. csrf complain solved by removing :via and :default
1. csrf complain solved by removing :via and :default.  2. Restore and modified part of the user_controller to avoid merge conflict
Merge branch 'master' of github.com:Silenthillnight/cs169