bluetooth new proximity algorithm
Merge remote-tracking branch 'origin/master' into feature/newui

Conflicts:
	thekiller/TKServer.m