move flair
Merge branch 'develop'