Animation commit
Merge remote-tracking branch 'origin/animation'

Conflicts:
	AetherForge-desktop/.project
	AetherForge/src/edu/virginia/cs/sgd/game/controller/Battle.java
	AetherForge/src/edu/virginia/cs/sgd/game/model/EntityFactory.java
	AetherForge/src/edu/virginia/cs/sgd/game/model/Map.java