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
Product URL  now forced to parents if variation
More Dutch Language
Merge pull request #349 from jaapjolman/1.2/develop

More Dutch Language
Added attributes to products plugin
Fixed syntax errors in example category tree
Updated cart insertion logic for URLs
Merge pull request #352 from superrbstudio/1.2/develop

Fixed syntax errors in example category tree
Order by attributes were not handled as per the documentation. Allows ordering of categories by a specific field via the plugin
Revert to tree sorting when an order attribute is not available