Merge branch 'master' into inventory
Background translation fixed
Merge branch 'master' into inventory
Merge branch 'inventory' of https://github.com/Mathgoat/square-loot into inventory