added best_in_place editing to user profile (if current_user)
resolved conflicts
resolved conflicts