user password
Merge branch 'master' of https://github.com/fizk/stjornvisi-zend-2

ry,
i need to merge
all kinds