Got the stylists and client edits working
Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
More stuff