speed up
Merge remote-tracking branch 'origin/combineAK' into combineAK

Conflicts:
	bw4t-client/log.txt
	bw4t-server/log.txt