adjust fineuploader
Merge branch 'master' of https://github.com/popsup/popsup

Conflicts:
	protected/components/views/imageUploader.php
	protected/controllers/UploadController.php