user profile fully implemented
fixed merge conflicts
fixed some details
fixed bugs
fixed merge conflicts