Fixed resize problem
Merge branch 'develop' of https://github.com/bellevik/glory into develop

Conflicts:

zombie-world/src/se/glory/zombieworld/model/entities/items/QuickSelectio
n.java