Tiny
Merge remote-tracking branch 'original/master'

Conflicts:
	module/Application/view/layout/layoutRecetas.phtml