fixing an invalid operation error with openGL

modified:   src/entity/npc/LivingEntityManager.java
Merge branch 'master' into inventory
first attempt at using nifty (windows test)

modified:   src/game/Game.java
modified:   src/game/GameLoop.java