Full animation
Merge remote-tracking branch 'origin/animation'

Conflicts:
	AetherForge/src/edu/virginia/cs/sgd/Entry.java
	AetherForge/src/edu/virginia/cs/sgd/game/model/EntityFactory.java
	AetherForge/src/edu/virginia/cs/sgd/game/model/Map.java
	AetherForge/src/edu/virginia/cs/sgd/game/model/components/Weapon.java
	AetherForge/src/edu/virginia/cs/sgd/game/view/RenderSystem.java
	AetherForge/src/edu/virginia/cs/sgd/game/view/Viewer.java
	AetherForge/src/edu/virginia/cs/sgd/menu/AbstractScreen.java
	AetherForge/src/edu/virginia/cs/sgd/tests/BattleSystemTests.java
	AetherForge/src/edu/virginia/cs/sgd/util/Animation.java