Battlefield update (almost done)

Card: apply as/spell method
CardHolder: add display type
Inw: fix and temporary decrease label length
Main add cardholder orig
DropHandler: fix listener bug, source Cardholder bug
Merge branch 'master' of https://github.com/assasin190/ICECardWars

Conflicts:
	src/main/Battlefield.java