Merged changes from 1.2/develop
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	README.md
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	README.md
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' of https://github.com/firesale/firesale into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge branch '1.2/develop' into 1.3/develop
Merge remote-tracking branch 'origin/1.2/develop' into 1.3/develop
Updated versions
Updated image script for cart data
Fix ambiguous where for is_variation for certain cases
Clear cache for new/updated shipping methods.
same_as_billing address checkout fix
Check if additional_fields not empty

Before insert additional_fields .... check if the field not empty
Merge pull request #375 from ekoisa/patch-1

Check if additional_fields not empty
Fix sub category and sub sub category plugin