add registration nav modal with stylists and client reg modals
fix merge conflicts
fix merge conflicts
fix merge conflicts