added combo point bar

increased health bar height from 17 to 20

changed element layers slightly
cleanup combo point bar test code

still have to add combo bar 4/5 for non warrior classes