remove password_confirm
resolve conflict routes
Merge branch 'users' of github.com:hermanos/audioguide into users