login/registration stuff
Merge branch 'master' of https://github.com/geoffreywoo/otoro-client-2