Fixed i18n
Merge branch 'follow_us_on_twitter'