Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
	Bounties/src/sim/app/bounties/LearningAuctionAgent.java
Made the tests automated
Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bondsman.java
	Bounties/src/sim/app/bounties/Bounties.java
	Bounties/src/sim/app/bounties/NewComplexRobot.java
	Bounties/src/sim/app/bounties/NewSimpleRobot.java
	Bounties/src/sim/app/bounties/Task.java