Altered the Shop design. Basically Shop is now a StockedShop (hence the deletion) which handles the mainStock only. (Adding & removing won't effect the mainStock as description states).
GeneralStore remains mostly the same but all playerStock features moved in here so changes had to be made. Attempted to generalize the Shop and get rid of a few shop instanceof GeneralStore.
As Shop design was altered, new StockedShop was changed to new Shop.
As Shop design was altered I was able to delete some shop instanceof GeneralStore lines and replace it with a check if the shop has a playerStock.
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..
Merge pull request #4 from FearTheDust/master

Redoing shops again