EMBRYO-207: It must be possible for users to reset their password
Merge branch 'master' of https://github.com/dma-dk/Embryo

Conflicts:

embryo-user/src/main/java/dk/dma/embryo/user/service/UserServiceImpl.jav
a