Merge Openbadges initial testing branch