changed stuff
Merge branch 'master' of https://github.com/WouterVeen/JadeMarktplaats

Conflicts:
	src/behaviours/GUIBehaviour.java
	src/behaviours/SellBehaviour.java
	src/marketeer/Auction.java
	src/marketeer/Marketeer.java
	src/marketeer/PartTypeProperties.java
as