New Shop - Everything in one class now with a few "flags" as requested. There is a constructor to create a Shop with only a player stock as well.
Changed to fit the new Shop.
Changed to fit the new Shop.
Merge IfearI/master

Conflicts:
	src/net/scapeemulator/game/io/JdbcSerializer.java
	src/net/scapeemulator/game/model/player/ShopHandler.java
	src/net/scapeemulator/game/model/shop/GeneralStore.java
	src/net/scapeemulator/game/model/shop/Shop.java

Something got fked up, but everything should be fine now..(GameServer & Entity have no changes, git hates me.)
Merge IfearI/master

Conflicts:
	src/net/scapeemulator/game/io/JdbcSerializer.java
	src/net/scapeemulator/game/model/player/ShopHandler.java
	src/net/scapeemulator/game/model/shop/GeneralStore.java
	src/net/scapeemulator/game/model/shop/Shop.java

Something got fked up, but everything should be fine now..