Merge branch 'master' of https://github.com/cipacda/jquery-fileupload-rails

Conflicts:
	vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-process.js
	vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-ui.js
	vendor/assets/javascripts/jquery-fileupload/jquery.fileupload-validate.js
	vendor/assets/javascripts/jquery-fileupload/jquery.fileupload.js
	vendor/assets/javascripts/jquery-fileupload/jquery.iframe-transport.js
	vendor/assets/stylesheets/jquery.fileupload-ui.scss

Author: cipacda