added shopingview
Merge branch 'develop' into images

Conflicts:
	zombie-world/src/se/glory/zombieworld/model/entities/Player.java
	zombie-world/src/se/glory/zombieworld/view/GameView.java
placing of shoppingviewcontainers
shopview
opening shop
Added Superclass progressbar and subclass itembar that shows differences in strengths of different weapons
Merge branch 'images' of https://github.com/bellevik/glory into images
Added drawing textures for StreetObjects
fully implemented the shop
Added image house done 2.png
Refactored healthbar by making the it using the progressbar class in the new package
Removed some unnecessary outcommented old code lines
Fixed conflicts
Fixed conflicts