a lot of work was done
search fix
search controller fixed
Merge branch 'JSFIX'

Conflicts:
	TestProject.v11.suo