update badge engine
Merge remote-tracking branch 'stephen/master'
badge wiz