Se eliminan Warnings

Change-Id: I9a3673e5964cc3eed5b78a0aec001c847c8ce91d
bla bla
Se eliminan Warnings

Change-Id: I9a3673e5964cc3eed5b78a0aec001c847c8ce91d
bla bla
Merge remote-tracking branch 'original/master' into master_2
Merge branch 'master' into master_2