adding the Key item

new file:   assets/textures/key.png
modified:   src/item/Battery.java
modified:   src/item/ItemListEnum.java
new file:   src/item/Key.java
modified:   src/rendering/TextureManager.java
updating inventory to handle and keys and batteries

modified:   src/entity/player/Player.java
modified:   src/userInterface/inventory/Inventory.java
modified:   src/userInterface/inventory/InventoryItemEnum.java
minor modif
Merge branch 'master' of https://github.com/Mathgoat/square-loot.git
power room light position correction
energyshot light bug
shot create light
higher fire rate and speed
EnergyShot fix
code cleaning
implementing picking up of batteries
Merge branch 'master' into items

Conflicts:
	src/item/Item.java
bigger light
changing the initial state of the game

modified:   src/game/GameLoop.java
Merge remote-tracking branch 'origin/energyshot'

Conflicts:
	src/entity/player/Player.java
	src/event/control/PlayerControl.java
	src/game/GameLoop.java
battery receptacle lighting
color change
implementing battery consumption
Merge branch 'master' into items

Conflicts:
	src/environment/blocks/BatteryReceptacleBlock.java
adding a market room

new file:   assets/textures/shopkeeper.png
modified:   src/entity/EntityManager.java
new file:   src/entity/npc/Shopkeeper.java
modified:   src/entity/player/Player.java
modified:   src/environment/MapGenerator.java
modified:   src/environment/blocks/BatteryReceptacleBlock.java
new file:   src/environment/room/Market.java
modified:   src/event/control/PlayerControl.java
modified:   src/item/Equipment.java
modified:   src/item/weapon/EnergyWeapon.java
modified:   src/item/weapon/LaserRifle.java
modified:   src/item/weapon/Weapon.java
modified:   src/physics/GameBodyType.java
modified:   src/userInterface/inventory/Inventory.java