Merge tag '0.7.1' into develop

Released 0.7.1 0.7.1
set user after password reset, only if activated
bumped version
Merge branch 'release/0.7.2'