Animation update
Merge branch 'master' of https://github.com/jpedrorl/CampJam14

Conflicts:
	PlatformPrototype/build/classes/code/Animation$PointInTime.class
	PlatformPrototype/build/classes/code/Animation.class
	PlatformPrototype/build/classes/main/Panel.class
	PlatformPrototype/build/classes/resources/ResourceManager.class
	PlatformPrototype/build/classes/states/GameStateGame.class
	PlatformPrototype/build/classes/states/GameStateManager.class
	PlatformPrototype/build/classes/states/GameStateMenu.class
	PlatformPrototype/src/main/Panel.java
	PlatformPrototype/src/resources/ResourceManager.java
	PlatformPrototype/src/states/GameStateManager.java