Done: Password change feature
Fixed some conflicts mergin branch T61 into master