Merge branch 'master' of https://github.com/dynamicweb/solutionset

Conflicts:

Files/Templates/Designs/eCommerce/assets/.sass-cache/5686a900cf3b41211f4
82eb760437ee0d5c67fc2/_support.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/67f844346263ee2c377
03f133d58476337e44802/__vars.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/67f844346263ee2c377
03f133d58476337e44802/checkout.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/67f844346263ee2c377
03f133d58476337e44802/ie.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/67f844346263ee2c377
03f133d58476337e44802/print.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/67f844346263ee2c377
03f133d58476337e44802/screen.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_appearance.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_background-clip.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_background-origin.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_background-size.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_border-radius.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_box-shadow.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_box-sizing.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_box.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_columns.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_filter.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_font-face.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_hyphenation.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_images.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_inline-block.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_opacity.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_regions.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_shared.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_text-shadow.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_transform.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/90a1de8fdee7cf03b11
8cce3761eff81ca3633ad/_transition.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/b5bc8bcbbc811a238ab
d7a278e653cda48bb41d5/_hacks.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_404.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_basic.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_buttons.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_customer-center.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_footer.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_frontpage.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_header.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_instant-search.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_modals.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_navigation.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_product-catalog.scssc

Files/Templates/Designs/eCommerce/assets/.sass-cache/ebe5e24d92e80e43cee
8d4f0ba511cf3fd9ced49/_sprites.scssc