tiny change
Merge branch 'master' of https://github.com/WingsProject/Redbull

Conflicts:
	add_inventory.php
	core/classes/item.php