New branch physics
Update physics
Merge branch 'master' into physics

Conflicts:
	src/entity/player/Player.java
	src/game/GameLoop.java
Update physics (NPC)
Adjust physics parameter
Remove useless import + print
Merge branch 'master' into physics

Conflicts:
	src/game/GameLoop.java
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
Update physics. Add a general unit.
Merge branch 'master' into inventory
update the context in which nifty is rendered

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