Shipping option restored in checkout. Closes #289
Updated the product pre-update event
Updated readme and versions
increased php execution time limit as well as moved 

Increased php execution time limit (for those of us with slower machines)
refactored repetitive foreach ($fields AS &$field) to separate function call --> $this->add_stream_fields($fields, $template)
changed version back 1.2.1-dev

public $version = '1.2.1-dev';
Merge pull request #305 from chusting/1.2/develop

increased php execution time, minor refactor repetitive code
Added out-dated multiple field type warning
Added 2.1.5 support for permissions
Fixed dashboard query. Close #301
Updated single image query
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
Fixes ambiguous columns. Closes 310
Check core path for asset namespace