Merge pull request #98 from BuracayBeach/team_UI

Team ui
Added type filtering
Merge branch 'master' of https://www.github.com/BuracayBeach/myfirstrepo into team4_v2.4
fixed notif
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into v2.3.b
Merge pull request #99 from BuracayBeach/v2.3.b

V2.3.b
Merge branch 'master' of https://www.github.com/BuracayBeach/myfirstrepo into team4_v2.4
Merge pull request #100 from BuracayBeach/team4_v2.4

Team4 v2.4
Shown managviews
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team_UI