Merge origin/master

Conflicts:
	funciones.php
Merge origin/master