mejorando canjes
Merge branch 'master' of https://github.com/meruba/sisfa

Conflicts:
	app/views/canjes/new.html.erb