Add display:block so no-src default image works across browsers
Merge pull request #706 from stenington/679-distorted-images

Add display:block so no-src default image works across browsers
fixes image issue
Merge remote-tracking branch 'origin/master'
Fixing a couple cases where emails were normalized via normalizeUsername, stripping their @ symbols.
Change 'signuptokens' table ref to be 'SignupTokens'.

This is an attempt to fix the following broken travis build:

https://travis-ci.org/toolness/csol-acceptance-tests/builds/8449728

based on the following information:

http://dev.mysql.com/doc/refman/5.0/en/identifier-case-sensitivity.html
Fix crash when a <13 learner without a signed-up guardian applies for a badge.
Merge pull request #707 from christensenep/686-more-reset-password-fixes

Fix password reset and login for learners entering their email address instead of username
fixes issue where unverified < 13 users are unable to claim a badge
Merge branch 'master' of https://github.com/mozilla/CSOL-site