added user profile page, welcome page user profile partial
merge conflicts
merge conflicts fix