Merge remote-tracking branch 'origin/master'

Conflicts:
	Laputa/src/main/java/BetMatchProcessing/BetMatchHistoryProcessor.java