Merge branch 'master' into design_merge
Major tags overhaul combining user and team tags
Merge branch 'design_merge'