RAZ-1421 - FTP Upload: Option to NOT create a ZIP for uploading : Issue Fixed.
RAZ-1421 - FTP Upload: Option to NOT create a ZIP for uploading : Issue Fixed
Merge branch 'feature/issue_1421' of github.com:razuna/razuna into feature/issue_1421

Conflicts:
	global/cfc/files.cfc
	global/host/dam/controller/circuit.xml.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