Merge branch 'hotfix/2.1.7'
Starting 2.1.8 hotfix
Restore basic entities in payment methods (#1256)
CS
Dropped old methods from Isotope 1.4
Prevent same-name files from overwriting previous ones (#1247)
Updated fineuploader to fix IE issue (#1238)
Fixed image uploads when IE uses iframes instead of ajax (#1238)
Strip insert-tags from product description
Release 2.1.8
Merge branch 'hotfix/2.1.8' into develop