Merge branch 'hotfix/activex-and-rfc3986'
release 3.8.2 hotfix
release 3.8.2 hotfix
Merge branch 'master' into develop

Conflicts:
	README.md
	bower.json
	client/js/version.js
	fineuploader.jquery.json
	package.json