Zip files and one form
Merge remote-tracking branch 'origin/master'

Conflicts:
	acp/upload_extensions_module.php
	adm/style/acp_upload_extensions.html
	adm/style/css/upload_extensions.css
	adm/style/js/upload_extensions.js
	language/en/upload_extensions.php