Merge branch 'master' into translation
Merge pull request #67 from codeforamerica/translation

Translation updates
Merge branch 'master' into admin