Added an inventory tab to the shop activity

[arnaudcoj]

Added an "Inventory" tab (which is similar to Heroinfo_Inventory) in the shop screen to make the item comparison easier.

[Zukero]

Why do you copy Heroinfo_Inventory's code into Shopinfo_Inventory, instead of having Shopinfo_Activity extends Heroinfo_Activity ?
Code duplication just calls for bug duplication...

I could understand "duplicating" some methods, in order to alter behavior (prevent equipment changes for instance), but copying the whole class just seems wrong.

You could alter visibility of methods and members in the superclass if needed though (private -> protected).

[arnaudcoj]

I agree with you, but with Heroinfo_Inventory being final, I thought it was better to duplicate. Now HeroinfoActivity_Inventory is no longer final and ShopActivity_Inventory extends it.

[Zukero]

Looks good to me. I'll just need to test it for a while before I merge it in master.
In the mean time you can add yourself (yourselves ?) to the res.strings.authors.xml credits.