Working on Salon
Merge changes to salon
Cleans up user profile code
...