i18n in place
unecessary dot
Merge branch 'prepare-full-i18n' of github.com:lewagon/www-sinatra into prepare-full-i18n
Merge branch 'master' into prepare-full-i18n
Add helpers for cities as well
first shot
Force wercker
small increase on program page
Merge branch 'prepare-full-i18n' of github.com:lewagon/www-sinatra into prepare-full-i18n
finishing on traduction placeholders
rewording in english translation
rewording in english translation
Adding i18n for cities + Language dropdown in navbar
Merge pull request #40 from lewagon/i18n-for-cities

Adding i18n for cities + Language dropdown in navbar
hiding blog for english
fix conflicts for merge
translation staff bios
small changes on program translation
Fix duplicate locale in URL
small fix