Merge origin/master

Conflicts:
	src/java/Controller/BidController.java
Merge origin/master