*agregados controles en convert_document_controllers

* agregado rspec incompleto de convert_document_controller. Hay que continuarlo
fixed conflicts
*Arreglados los controles del convert_document_controller de la api
Fixing merge in convert_document_controller
Merge branch 'proyecto-devise' of https://github.com/federicogodan/Document-Converter into proyecto-devise
Mergeo gema, control, vista new