Jalan
Merge remote-tracking branch 'origin/master'

Conflicts:

	CardCaptorMagimon/bin/classes/com/tekmob/cardcaptormagimon/MainMenu.class
	CardCaptorMagimon/bin/classes/entity/Magician.class
	CardCaptorMagimon/bin/classes/model/MagicianModel.class