#778 - fix reset issue if paste feature not enabled
Merge branch 'master' into 3.5-IP

Conflicts:
	build.gradle
	fineuploader.jquery.json
	readme.md