Added Tooltip to Fav buttons
more favorite tooltips
added a modal to challenges apply button
added favicon
Merged Changes
Merged changes from master
Changed phrase of fav tooltips
implemented static html for my badges design
added shre modal window on my badges page
added font awesome
Added apply modal window and static button to single badge page
preliminary v2 layout
Merge remote-tracking branch 'upstream/master'
Adding a module to send emails through Mandrill.
CSOL_MANDRILL_KEY is the only required piece of configuration.
Additionally, setting DEBUG and CSOL_DISABLE_EMAIL in the env
will cause the module to log instead of posting to the Mandrill
API. Template names can be configured in the module itself.
The module exports one method: send(template, context, recipients, callback)
Merge pull request #269 from stenington/mandrill-email

Adding a module to send emails through Mandrill.
Merge pull request #263 from coryshaw/master

Template Updates
Merge pull request #267 from andrewhayward/auth

Adding response locals to template rendering
merge new style with latest ocupop
merge new style with latest ocupop
Merge branch 'master' of https://github.com/mozilla/CSOL-site

Conflicts:
	static/media/css/core.css
	static/media/less/core.less
	views/layout.html