cambios varios

algunos cambios, faltan muchos q agregar
Merge branch 'testing' of https://github.com/ImperiumSAMP/MalosAiresRolePlay into testing