catalog refactor
Merge branch 'master' of https://github.com/oleander/jbay

Conflicts:
	JADE/src/MakeBidBehaviour.java
	JADE/src/RequestCreateAuctionBehaviour.java