Merge branch 'master' of https://github.com/mozilla/CSOL-site
Merge branch 'master' of https://github.com/mozilla/CSOL-site
Adjusting claim code template
Add new data to learner model.
Updated copy on MyBadges

Copy for MyBadges
Merge pull request #542 from mozilla/chris-fixes

added copy and video to empty backpack page
added no_data text for my badges. fixes #399
merged from upstream
Plugging claims into guardian dashboard
Merge pull request #545 from andrewhayward/claims

Getting badge claims into guardian dashboard
Merge pull request #544 from curlee/master

updates for mybadges copy
Form options for required optional data.
Merge pull request #540 from mozilla/338-optional-learner-data

Add new data to learner model.
Updated FAQ

18 back to 13
Missing global flag

Resolves #546
Fix issue with underage signup.
Merge remote-tracking branch 'origin/erin'
adding terms and privacy fixes #429
changing age back to 13
Merge pull request #548 from mozilla/chris-work

changes to 1.0.2