merge strings to ease translations
Merge pull request #4220 from Alys/commGuide-translation-fix-2014-11-04

merge strings to ease translations
chore(upgrade): passport-facebook
bailey: backgrounds, beeminder
feat(emails): add recaptureEmailsPhase path to flags
fix(facebook): attempt using a callback buster to generate a new
authorization code #4221
fix(facebook): try using facebook oauth route 2.1 #4221
fix(facebook): move from passport-facebook to Facebook JS SDK. Better
security on FB login by validating accessToken. Create user from FB
profile if none exists, allows 3rd-party apps to. Fixes #4221
feat(auth): move to hello.js for social auth, paves the way for multiple
connectors. Prettier buttons via zocial
bailey(costumes)