fixed bug with clipboard images
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/modules/upload/uploadController.js