Merge branch 'hotfix/flag_status'
Twitter feed added to dashboard
Merge branch 'hotfix/twitter' into develop