Fixed conflicts for https://github.com/OpenPoGo/OpenPoGoWeb/pull/116
Removed the pokedex fix since it already got implemented.
Removed the candy fixed reference since it already got implemented.
Kept:
Change the item count on bag, instead of showing the total of items, it shows the sum of the quantities of items.
Once you do merge this, please close #116
Fixed conflicts for https://github.com/OpenPoGo/OpenPoGoWeb/pull/116 Removed the pokedex fix since it already got implemented. Removed the candy fixed reference since it already got implemented. Kept: Change the item count on bag, instead of showing the total of items, it shows the sum of the quantities of items. Once you do merge this, please close #116