renamed badge sprites.  implemented sd and hd badge sprites
fixed merge conflict