Merge pull request #168 from BuracayBeach/team_UI

Team ui
LOLZ
Merge pull request #169 from BuracayBeach/Team_5_Version_2.0

LOLZ
Added tab to tab navs (announcements)