toward the features allowing to move items around within the inventory

modified:   src/userInterface/Inventory.java
modified:   src/utils/NonContinuousTable.java
it is now possible to change the object order in the inventory

modified:   src/event/control/PlayerControl.java
modified:   src/userInterface/Inventory.java
Merge branch 'master' into inventory
better handling of the reordering feature in the inventory

modified:   src/event/control/PlayerControl.java
modified:   src/userInterface/Inventory.java
Merge branch 'master' into inventory
Merge branch 'master' into inventory
Merge branch 'master' into inventory
Merge branch 'inventory' of https://github.com/Mathgoat/square-loot into inventory
Merge branch 'master' into inventory
first attempt at using nifty (windows test)

modified:   src/game/Game.java
modified:   src/game/GameLoop.java
Merge branch 'master' into inventory
update the context in which nifty is rendered

modified:   src/game/Game.java
modified:   src/game/GameLoop.java
Merge branch 'master' into inventory

Conflicts:
	src/game/Game.java
	src/game/GameLoop.java
fixing the null pointer exception crash.

modified:   src/game/GameLoop.java
major cleaning before update the inventory behaviour to
fit the modification made in the game desgin document, namely
adding specific equipment slots, and carrying battery.

modified:   src/entity/LivingEntity.java
modified:   src/event/control/PlayerControl.java
deleted:    src/userInterface/Inventory.java
new file:   src/userInterface/inventory/Inventory.java
new file:   src/userInterface/inventory/InventoryItemEnum.java
the inventory now handles 5 specific slots, allowing for the handling
of the equipment active skills

modified:   src/entity/player/Player.java
modified:   src/userInterface/inventory/Inventory.java
modified:   src/userInterface/inventory/InventoryItemEnum.java
Merge branch 'master' into inventory
Merge branch 'master' into inventory
handling of the battery by the inventory
pressing f when carrying one drops it

modified:   src/entity/player/Player.java
modified:   src/environment/Map.java
modified:   src/environment/room/Room.java
modified:   src/event/control/PlayerControl.java
modified:   src/userInterface/inventory/Inventory.java
modified:   src/userInterface/inventory/InventoryItemEnum.java