homilia 20-07-14
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/homilias/homilia-20-07-14.html