Merge branch 'master' of https://github.com/Isrro/Neko

Conflicts:
	Kuro_Neko/src/com/me/game/WorldGameRender.java
nosee
Merge branch 'master' of https://github.com/Isrro/Neko

Conflicts:
	Kuro_Neko/src/com/me/game/WorldGameRender.java