Pain, oh the pain
Merge branch 'master' of http://github.com/bagedevimo/pxljm
Merge branch 'master' of http://github.com/bagedevimo/pxljm

Conflicts:
	eclipse/src/goldeneagle/entities/PlantEntity.java
	eclipse/src/goldeneagle/state/MainGameState.java