fixed logout rspec
fix merge conflicts Merge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
pulling fog.init fileMerge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev
add map to stylist show page viewed by client including salon marker
add salons to seed file to show link between client and stylist salon
reseedMerge branch 'dev' of https://github.com/strivedi183/snippyskippy into dev