Fora l'annotation de JellyBean al TabBar
Merge remote-tracking branch 'origin/master'