Add Dashboard functions
merging with conflicts
Added Dashboard functions and password resets