Branch de developers

Integracion de developer a master!