Testing build.xml location into the tests folder.
having to commit to account for the standards changes james has done.
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/payment/bluepay_hosted_form.php
	upload/admin/controller/payment/bluepay_redirect.php
	upload/admin/controller/payment/pp_pro.php
	upload/admin/controller/payment/sagepay_direct.php
	upload/admin/controller/payment/sagepay_server.php
	upload/admin/controller/sale/customer.php
	upload/admin/controller/sale/return.php
	upload/admin/controller/setting/setting.php
	upload/admin/controller/tool/backup.php
	upload/admin/model/catalog/category.php
	upload/admin/model/catalog/manufacturer.php
	upload/admin/model/catalog/product.php
	upload/admin/model/payment/bluepay_hosted_form.php
	upload/admin/model/payment/bluepay_redirect.php
	upload/admin/model/payment/sagepay_direct.php
	upload/admin/model/payment/sagepay_server.php
	upload/catalog/controller/account/return.php
	upload/catalog/controller/common/maintenance.php
	upload/catalog/controller/feed/google_sitemap.php
	upload/catalog/controller/payment/bank_transfer.php
	upload/catalog/controller/payment/bluepay_hosted_form.php
	upload/catalog/controller/payment/bluepay_redirect.php
	upload/catalog/controller/payment/cheque.php
	upload/catalog/controller/payment/nochex.php
	upload/catalog/controller/payment/paypoint.php
	upload/catalog/controller/payment/pp_standard.php
	upload/catalog/controller/payment/sagepay_direct.php
	upload/catalog/controller/payment/twocheckout.php
	upload/catalog/controller/payment/web_payment_software.php
	upload/catalog/controller/payment/worldpay.php
	upload/catalog/controller/product/category.php
	upload/catalog/controller/product/manufacturer.php
	upload/catalog/controller/product/product.php
	upload/catalog/controller/product/search.php
	upload/catalog/controller/product/special.php
	upload/catalog/model/account/download.php
	upload/catalog/model/account/order.php
	upload/catalog/model/affiliate/affiliate.php
	upload/catalog/model/catalog/category.php
	upload/catalog/model/catalog/product.php
	upload/catalog/model/checkout/fraud.php
	upload/catalog/model/checkout/voucher.php
	upload/catalog/model/checkout/voucher_theme.php
	upload/catalog/model/payment/authorizenet_aim.php
	upload/catalog/model/payment/authorizenet_sim.php
	upload/catalog/model/payment/free_checkout.php
	upload/catalog/model/payment/nochex.php
	upload/catalog/model/payment/paymate.php
	upload/catalog/model/payment/paypoint.php
	upload/catalog/model/payment/perpetual_payments.php
	upload/catalog/model/payment/pp_express.php
	upload/catalog/model/payment/pp_pro.php
	upload/catalog/model/payment/pp_standard.php
	upload/catalog/model/payment/sagepay_direct.php
	upload/catalog/model/payment/sagepay_server.php
	upload/catalog/model/payment/sagepay_us.php
	upload/catalog/model/payment/twocheckout.php
	upload/catalog/model/payment/worldpay.php
maintenance changed to conform to standards
Added 404 header for categories,products,info and manufacturers.

Modified build xml
Moved build.xml back to root.
Update product.php

Added "nl2br" for review text
Update customer_online.php

Fix limit problem in $filter_data
removed the auto load as it makes the code look unintelligible.
Merge branch 'master' of https://github.com/opencart/opencart
Merge pull request #1783 from ghost/patch-1

Update product.php
Merge pull request #1782 from ghost/patch-4

Update customer_online.php
more removal of autoload and changes for to the event system
Merge branch 'master' of https://github.com/opencart/opencart
namespaces and autoloading is still going to be used for library classes only
removed changes to the front controller, also added more work on the events system
just fixed the front seo url
forgot about soem files still using namespaces.
updated the extension install/uninstall methods to use the loader class
added the mails back to the checkout