last workable local test. before merge and UserListController not work
Merge remote-tracking branch 'origin/master'

Conflicts:
	Client/bin/.gitignore
	Client/bin/auction/client/login/SecuredConnectionController.class
	Client/bin/auction/client/view/BillFrame.class
	Server/bin/auction/server/Controller.class
	Server/bin/auction/server/Server.class
	Server/bin/auction/server/config/ConfigController.class
	Server/bin/auction/server/config/ConfigReader.class
	Server/bin/auction/server/config/ConfigWriter.class
	Server/bin/auction/server/config/model/Config.class
	Server/bin/auction/server/database/model/TestModels.class
	Server/bin/auction/server/view/ViewController.class
	Server/src/auction/server/service/task/ClientHandler.java