weather, homepage, swipe_bar
conflito
Merge branch 'master' of https://github.com/andreborralho/festivAllClient