more code added to the product filter feature. nearly finished.
more filter stuff done
more work done on the product filter system
filter sql update
product option fix
Update upload/admin/model/localisation/zone.php

Fix getZonesByCountryId so that it only return enabled zones otherwise in the admin customer and order pages you can select zones that are disabled
Merge pull request #265 from rebdog/zone-fix

Fix admin getZonesByCountryId so that it only returns enabled zones
Update upload/system/library/request.php

Default encoding for the htmlspecialchars function is ISO-8859-1 in versions of PHP prior to 5.4.0, and UTF-8 from PHP 5.4.0 onwards.
Better if encoding is always specified to UTF-8. I think this is what may have caused "broken" settings in modules (like in welcome module) etc. resulting in error messages like "Notice: unserialize() [function.unserialize]: Error at offset 58793 of 65535 bytes in admin/index.php" 
Update upload/system/library/request.php
Merge pull request #266 from rokdazone/patch-2

Update upload/system/library/request.php
more work done on the filters
more of the filter done. pretty much finished.

i have also updated the the var names for searching
changed private methods to protected for the controllers and models.

thx mhcwebdesign
Fix customer's cart added to admin edited order

https://github.com/opencart/opencart/issues/268
Merge pull request #269 from ADDCreative/patch27

Fix customer's cart added to admin edited order
small bug with the category path changed in the last commit.
started work on the upgrade script
more done on the new upgrade script
more of the opencart upgrade script done
more upgrade script done