Merge remote-tracking branch 'origin/master' into Cole
changed button order for melee
set up magic tower upgrades
See Decription

Added all magic tower level 1 upgrades.  Lightning tower still needs a
little work but almost done.  hopefully fixed bug with aoe tower.
Merge remote-tracking branch 'origin/Cole'