* Enable User activation (need to add reset the password feature)
Merge remote-tracking branch 'origin/master'