Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
	Bounties/src/sim/app/bounties/NewComplexRobot.java
Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
	Bounties/src/sim/app/bounties/NewComplexRobot.java
Merge origin/master

Conflicts:
	Bounties/src/sim/app/bounties/Bounties.java
	Bounties/src/sim/app/bounties/LearningAuctionAgent.java
Merge origin/master