reports
Merge branch 'master' of https://github.com/jcortesg/meridia

Conflicts:
	app/views/prospects/_form.html.haml