added mysql username and password fixes GH #128
Merge pull request #129 from ossreleasefeed/update-localjs-128

added mysql username and password fixes GH #128
Fix errant apostrophe [closes #140]
fixes errant apostrophe [closes #132]
Merge branch 'production' of github.com:mozilla/openbadges into production
Merge branch 'production' into development
Fix badge images coming from the issuer API when they are relative.
Fix test by cheating.
Merge branch 'staging' into development
Fix for baking the raw image, before writing to disk
changes the code as per the conventions #139
Merge pull request #139 from pradeepmurugesan/development

Fix for baking the raw image, before writing to disk
closes #138: tou assent mirrors pp assent
closes #136; adding contact mailto link
closes #135; add padding to tou/pp
closes #134; links to legal FAQ
closes #133; remove term links to definitions
fix build by pointing to an image we control
failing test for good assertion/bad img url case
add error checking in callback when getting assertion image