RAZ-2 Trash function : updates and in progress
RAZ-2 Trash function : Updates and in progress.
RAZ-2 Trash function : Updates and in progress
RAZ-2 Trash function : Updated
RAZ-2 Trash function : Updated
RAZ-2 Trash function : Updated
RAZ-2 Trash function : Updated
RAZ-2 Trash function : set assetpath for col_get_trash in controller/circuit.xml.cfm
RAZ-2 Trash function : Trash function completed.
RAZ-2 Trash function : Add "in_trash" column in db_*.cfc and update.cfc. Added the thumbnail for the Collection.
Fixed updated.cfc for new column
SQL statements were wrong for adding new in_trash column!
Design changes and updates translations. Some other small updates to the trash
RAZ-2 - Trash function : issue fixed
Update table and update scripts for the foreign key
RAZ-2 - Trash function : choose folder for restore functionality is updated.
Merge branch 'feature/issue_2' of https://github.com/razuna/razuna into feature/issue_2
RAZ-2 - Trash function : choose folder functionality for folder restore updated.
Fix design issues
Merge branch 'feature/issue_2' into develop

Conflicts:
	global/cfc/folders.cfc
	global/cfc/update.cfc
	global/config/config.cfm
	global/host/dam/controller/circuit.xml.cfm
	global/host/dam/views/ajaxparts/dsp_collections_list.cfm
	global/host/dam/views/ajaxparts/dsp_folder_audios.cfm
	global/host/dam/views/ajaxparts/dsp_folder_content.cfm
	global/host/dam/views/ajaxparts/dsp_folder_content_results.cfm
	global/host/dam/views/ajaxparts/dsp_folder_files.cfm
	global/host/dam/views/ajaxparts/dsp_folder_images.cfm
	global/host/dam/views/ajaxparts/dsp_folder_videos.cfm
	global/host/dam/views/ajaxparts/inc_detail_buttons.cfm
	global/host/dam/views/ajaxparts/win_collection_detail.cfm
	global/host/dam/views/dsp_menu_left.cfm
	global/translations/Danish/HomePage.properties
	global/translations/Dutch/HomePage.properties
	global/translations/English/HomePage.properties
	global/translations/French/HomePage.properties
	global/translations/German/HomePage.properties