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
Small change to the license
Correct version
Fixed HTTPS redirect bug
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Removed ajax request on product admin page load
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Fixed order count on product delete, close #324
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Merge branch '1.2/develop' into 1.3/develop

Conflicts:
	README.md
	firesale/details.php
Merge branch '1.2/develop' into 1.3/develop
Changed Default Currency Code setting to select instead of text
Update the list of options for Default Currency Code when currencies are added/edited/removed
Default to default currency as set by admin  instead of hard coded id 1