Primera adaptación
Merge remote-tracking branch 'origin/infouma-android-20130318'