Merge branch 'master' of git://github.com/mozilla/CSOL-site
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
added copy for delete modal. fixes #219
Implemented Copy for My Badges (learner) - Share modal. fixes #214
Merge branch 'master' into passwords

Conflicts:
	static/media/css/core.css
	static/media/css/core.min.css
Merge pull request #318 from stenington/under-13-claims

Building out claim code process for <13
turning off nunjucks autoescape
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into passwords

Conflicts:
	static/media/css/core.css
Merge pull request #321 from andrewhayward/passwords

Password reset
Merge remote-tracking branch 'curlee/master'
Merge remote-tracking branch 'origin/master'
Require a missing module