Merge remote-tracking branch 'erik/master'
Merge branch 'master' of heroku.com:cem-site
Merge remote-tracking branch 'origin/master'
adding google analytics tracking
Merge remote-tracking branch 'erik/various-small-fixes'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'erik/header-and-tooltip'
Merge remote-tracking branch 'origin/master'
Added footer.
Allow html in criteria.
Merge remote-tracking branch 'erik/add-footer'
adding faq to badge list page