updating
Merge branch 'master' of github.com:katke/mano

To work on it
need to pull to resolve conflicts.
Add confimation route, resoulve routes conflict.
Add password_field to new.html.erb, fix validate related to password.