add stylist show page
merge conflicts fixed
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
close stylist media modal when adding media
fix conflictsMerge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev