Agregue fotos y esas cosas
Merge branch 'dev3-fotos' into dev3

Conflicts:
	includes/dec-fotos-arr.php
	index.php