Prefilled cart: changed hint text
Merge branch 'atwix_feature/prefilled_cart' into atwix

Conflicts:
	app/code/community/Atwix/Tweaks/controllers/IndexController.php
	app/code/community/Atwix/Tweaks/etc/config.xml
	app/code/community/Ess/M2ePro/Model/Connector/Server/Amazon/VirtualRequester.php
	app/code/community/Ess/M2ePro/Model/Connector/Server/Ebay/VirtualRequester.php
	app/code/community/Ess/M2ePro/Model/Connector/Xfabric/Amazon/VirtualRequester.php
	app/code/community/Ess/M2ePro/Model/Connector/Xfabric/System/VirtualRequester.php
	app/design/adminhtml/default/default/template/M2ePro/wizard/amazon/installation/synchronization.phtml
	app/design/adminhtml/default/default/template/M2ePro/wizard/ebay/installation/synchronization.phtml
	app/design/adminhtml/default/default/template/M2ePro/wizard/step/amazon_account.phtml
	app/design/adminhtml/default/default/template/M2ePro/wizard/step/synchronization.phtml
	app/design/frontend/base/default/template/atwix/addtocart/progress.phtml
	app/design/frontend/carpartkings/default/template/argon/catalog/product/view/fit.phtml
	app/design/frontend/carpartkings/default/template/atwix/tweaks/roioptimizer.phtml
	app/design/frontend/carpartkings/default/template/catalog/product/list.phtml
	app/design/frontend/carpartkings/default/template/catalog/product/view.phtml
	app/etc/local.xml.prod
	app/etc/local.xml.qa
	app/etc/local.xml.unlooped
	downloader/lib/Mage/Backup/Exception.php
	js/argon/VehicleChooser.js
	media/categories/transfer-case.png
	nazdaq/php/feeds/google/class_bridge.php
	skin/frontend/carpartkings/default/css/styles.css
	skin/frontend/carpartkings/default/images/car_part_kings_logo_paypal.png