Se inicia con el detalle de las facturas
Merge branch 'master' of https://github.com/davidcaro/demoteros-app

Conflicts:
	template/billing.html
Merge branch 'master' of https://github.com/davidcaro/demoteros-app
Merge branch 'master' of https://github.com/davidcaro/demoteros-app
Merge branch 'master' of https://github.com/davidcaro/demoteros-app