Merge origin/master

Conflicts:
	administracion/administracion.dao/dao.php
Merge origin/master
Merge origin/master