Merge branch 'feat/1500_resetpasswd/develop' of https://github.com/robertperez-upc/ravada into develop