otro commit
cambios css
Merge remote-tracking branch 'origin/feature/iss90' into hotfix/iss164limpiaCadenaJSON

Conflicts:
	server/app/Plugin/DebugKit
re #164 limpiando el json con escape. Problema de la tilde.
Merge branch 'feature/iss90' into hotfix/iss164limpiaCadenaJSON
close #164 eliminado el problema de los apostrofes
Merge branch 'hotfix/iss164limpiaCadenaJSON'
Merge branch 'hotfix/iss164limpiaCadenaJSON' into desarrollo
fixed #162 Ya no se limita al desarrollar solo defensa
Merge branch 'hotfix/iss162' into desarrollo