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
Added order dispatched event
Fixes widget sql error
Fixes category widget SQL error
PyroCMS installer compatibility
More PyroCMS installer compatibility
Check if FireSale is in the system/cms directory
Merge branch '1.2/develop' of https://github.com/firesale/firesale into 1.2/develop
Fixes quick edit issue. Closes #309
Merge changes from 1.2/develop
Fixes ambiguous columns. Closes 310