Updated versions
Merge branch '1.2/master' of https://github.com/firesale/FireSale 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
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Merged changes from 1.2/develop
Fixed details conflict
Added multiple field type warning
Merged changes from develop
Merge changes from 1.2/develop
Merged changes from 1.2/develop
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Added secure cart option
Merge remote-tracking branch 'origin/1.2/master' into 1.2/develop