Removed extra quickswap in Player

The Player now uses the same list that is available from QuickSelection.
Weapons removed from QuickSelection are now unequipped
The SelectionStick now shows the selected weapon

The Items are also displayed correctly in the ItemContainers
Merge branch 'newweaponselect' into develop

Conflicts:
	zombie-world/src/se/glory/zombieworld/model/entities/Player.java
Merge branch 'develop' of https://github.com/bellevik/glory into develop