Merge branch 'release/7.0.6' into devel
woot vr is a sponsor
fixed some stuff to do with resetting. also added Kunal's tooltip.
these were ridiculously big
fixed password reset stuff mostly. also fireside stuff
Merge branch 'release/7.1.0'