local changes
Merge branch 'rent_articles' of https://github.com/suberbawer/ciclotimia into rent_articles

Conflicts:
	app/views/billings/provider_month_total.html.erb