wkhtmltopdf para crear pdf factura
Merge branch 'master' of https://github.com/dariso/CI-1330-Monchie

Conflicts:
	Monchie_app/Gemfile~

problema de merge por gemfile~