Searc cunstomization in progress
Re-factoring folder search
Further fixed RAZ-3200 with search and folders
Merge branch 'feature/RAZ-3200' into develop

* feature/RAZ-3200:
  Further fixed RAZ-3200 with search and folders
  Re-factoring folder search
  Searc cunstomization in progress

Conflicts:
	global/host/dam/controller/circuit.xml.cfm