Add function for user profile
solving merge
Adding tab permissions on navbar
Resolving conflicts merge among working_tree and cancancan