Updating UI files
Merge branch 'ah'

Conflicts:
	Actor.java
	AdultDragon.java
	Civilization.java
	Dragon.java
	ElderDragon.java
	Player.java
	YoungDragon.java