static object -> game object
Merge branch 'dev' of http://github.com/ForseenEnding/Janus.git into dev

Conflicts:
	src/com/janus/world/entity/object/GameObject.java