twitter button dumb
Merge branch 'dev'