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
Fixed product count in brands
Added < 2.2.0 menu support
Updated default brand route to fix pagination
Product filter settings are now remembered
Options cannot be null
Updated order item JS
Brands can now accept a category slug in the URL
Added anonymous stat tracking to (un)install
Greatly improved get_file_folder_by_slug

Moved the method to be a helper function and added an optional parent to
stop confusion between same slug categories, brand and products.