undo mask changes
revert to 947239
re-add unit changes and new abilities
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/scala/ui/GameDisplay.scala
	src/main/scala/world/GameInstance.scala
	src/main/scala/world/worldUnit/Ability.scala
	src/main/scala/world/worldUnit/abilities/BloodthirsterLifeGain.scala
	unit_stats.xml