waiting screen added
Merge remote-tracking branch 'origin/feature/juanlu' into feature/luis