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'