Merge pull request #99 from yinzanat/master

arena fix
d186: fixed conquest monster loop and chaining in arena by yinzanat
Fix loop conquest monster

Fix loop conquest monster when exipre timer don't draw
d187: fixed loop on conquest monster by Jigoku
fix for UI change

should fix the changes made to the header.