Add support for already encrypted passwords and merge zAuth-dev.