Restore development flag: stealing thimble ribbon but with SHA tooltip on hover
Merge branch '596-logo' of github.com:stenington/openbadges into badgetastic-preview

* '596-logo' of github.com:stenington/openbadges:
  Restore development flag: stealing thimble ribbon but with SHA tooltip on hover

Conflicts:
	views/layout.html