Searc cunstomization in progress
Re-factoring folder search
Removed debug info
added image
Merge branch 'feature/RAZ-3232' of github.com:razuna/razuna into develop

Conflicts:
	global/cfc/folders.cfc
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
RAZ-3231: Option to upload custom thumbnail for generic file types (ZIP, etc.)
- Added ability to upload custom thumbnails for documents similar to other assets
Fix for basket view not loading due to error
Tweak to prevent SQL error when spaces present in height and width on MS SQL
RAZ-3231: Option to upload custom thumbnail for generic file types (ZIP, etc.)
- Fix for version thumbs to display properly on AWS
Merge branch 'feature/RAZ-3231' of github.com:razuna/razuna into develop

Conflicts:
	global/host/dam/views/ajaxparts/dsp_folder_content_results.cfm
RAZ-3241: Have option to remove dedicated search tabs (docs, vid, img, aud)
- Added option to all tabs in advanced search except the 'All Assets' tab
Removed search debug info
Changed background color back to white
RAZ-3259: Disable search all in search selection
RAZ-3261: Option to remove headers for metadata in folder view
- Added option to hide labels in asset box view
RAZ-3261: Option to remove headers for metadata in folder view
- Tweak to message
Merge branch 'feature/RAZ-3261' of github.com:razuna/razuna into develop
Merge branch 'develop' into release/1.7

* develop:
  RAZ-3261: Option to remove headers for metadata in folder view - Tweak to message
  RAZ-3261: Option to remove headers for metadata in folder view - Added option to hide labels in asset box view
  RAZ-3259: Disable search all in search selection
  Changed background color back to white
  Removed search debug info
  RAZ-3241: Have option to remove dedicated search tabs (docs, vid, img, aud) - Added option to all tabs in advanced search except the 'All Assets' tab
  RAZ-3231: Option to upload custom thumbnail for generic file types (ZIP, etc.) - Fix for version thumbs to display properly on AWS
  Tweak to prevent SQL error when spaces present in height and width on MS SQL
  Fix for basket view not loading due to error
  RAZ-3231: Option to upload custom thumbnail for generic file types (ZIP, etc.) - Added ability to upload custom thumbnails for documents similar to other assets
  Further fixed RAZ-3200 with search and folders
  added image
  Removed debug info
  Re-factoring folder search
  Searc cunstomization in progress