fixed user bugs
user login file
user profile view
Merge branch 'master' into login_logout