Fix where this should be
Adjust indentation, add is_on_team (static for now)
Fix some bugs with announcements
Merge branch 'master' into develop