removed debugging comments
Merge branch 'feature/edit-bird'
Merge branch 'master' into ben-design-change
tweaking userbar to suit slight alteration to icon layout behaviour in this branch