Basic user modeling including secure password
Fixed merge