adicion core del sistema
Merge master into trunk