Merge remote-tracking branch 'mannix/master'
reload css
Merge remote-tracking branch 'mannix/master'
update badge engine
update badge engine
Merge remote-tracking branch 'stephen/master'