Merge pull request #687 from curlee/master

more p! tickets closed
P! fixes
Forgotten return on next(). Always forgotten returns on nexts()s.
Introducing isUnderage/notUnderage middleware to split out /mybadges and /mybadges/:id routes so underage never get shareTokens
Reset password emails will now be sent to guardians of <13 learners even if the guardian has not yet signed up.  Also fixed confirmation emails using the incorrect template.
Merge pull request #689 from christensenep/686-reset-password-fixes

Fix password reset emails for <13 learner whose guardian has not signed up
fixes password reset
Fixes distorted badge images and program logos by using max-width and
max-height instead of forcing width and height. Includes fix for IE8
max-width bug in display:table-cell element used for centering.
Introduces .no-src class to handle default images for programs or
badges without images.
Style tweaks and adjustments per code review
Merge pull request #691 from stenington/679-distorted-images

Prevent distorted badge images and program logos
new favicon
Replace images on level up page and remove markup
add link to third image
Use getDisplayName consistently as user's name on site
Merge pull request #688 from stenington/clean-up-share-token-logic

Clean up share token logic
Merge pull request #693 from mgballard/master

Favicon, 'level up' images...
Merge pull request #700 from stenington/677-name-consistency

Consistent user name display
many small fixes
levelup-3 image replacement
image element dimensions to match new image-3