forgot password changed to label, change password panel included
Merge origin/master
forgot password changed to label, change password panel included