Fixed details conflict
Added multiple field type warning
Merged changes from develop
Merge changes from 1.2/develop
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.
Updated license and readme
Updated stats
Merged changes from 1.2/develop
Fixed cart price mismatch
Fixed brand pagination with category selected
Formatted search term display
Updated breadcrumbs for brands and categories
Stopped click propagation on upload form
Some reformatting
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master
Small change to the license
Added secure cart option
Merge remote-tracking branch 'origin/1.2/master' into 1.2/develop
Correct version
Fixed HTTPS redirect bug