add twitter icon
Merge branch 'dev'