Merge branch 'master' of git://github.com/mozilla/CSOL-site
Emergent aestimia module
Starting to plug in aestimia
Merge branch 'master' of git://github.com/mozilla/CSOL-site
added real description from program model
fixed indentation
replaced program placeholder image with imageurl from api
Merge branch 'master' of git://github.com/mozilla/CSOL-site
Password reset functionality
Somehow we managed to lose the password styling
Merge branch 'master' into passwords

Conflicts:
	static/media/css/core.css
	static/media/less/core.less
footer adjustments and grid (earn page) fix
favorite hidden in css - this needs to be done in templates
Preliminary Challenges page (need copy + first image) and active menu item fix
Challenges title to match other pages
Simple DB migration wrapper
Updating `learner` model with first/last names
Adding migration script to package
Template/logic updates for first/last name
Minor style tweak that seems to have disappeared