Hero and Colossus Trigger
Berserker and Luna
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/fe/FightStage.java
	src/net/fe/Unit.java