add more rules to badge system
Merge remote-tracking branch 'mannix/master'
bw testing