Last changes of integration
Merge branch 'proyecto-devise' of https://github.com/federicogodan/Document-Converter into proyecto-devise

Conflicts:
	proyectoDevise/app/uploaders/file_uploader.rb