beta v0.5 the merge update

Merging is added to the game, so you can merge two unmerged units of the same type to gain +1 to all their stats and give them a sweet new look. A horrible bug involving vengeful that **still** caused crashes has been fixed **again**. Some polish was added to the UI as well.