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
added s3-fake.js and smoke test.
removed spurious console.log() statements.
Now fake S3 storage is used if CSOL_AWS_FAKE_S3_DIR is specified.

I also added some code that checks to see if the required CSOL_AWS_*
env vars are defined; if they're not, it throws a helpful error and
mentions that CSOL_AWS_FAKE_S3_DIR can be used as an alternative.

Unfortunately I haven't been able to test out this integration yet,
because I'm having trouble figuring out how to upload evidence locally on
the website...
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'