updated and tested all branches after moving files from affiliates directory to there own directory
uncommented an area I forgot from before on controller csv import file tested and ok
added and commented all files for custom search
Merge branch 'customsearch'
added library classes and modified startup.php
added library classes ebaycall and parsecsv
added js to fix import start dates in ebayid importer and made some changes to wait loader
added starter files and code for product_upload
added custom_shipping model and finished product upload images and other testing should be complete
completed starter templates for custom shipping methods
Merge branch 'productupload'