Merge branch 'drag-and-drop' of https://github.com/trello/staunton into hao
Merge branch 'drag-and-drop' of https://github.com/trello/staunton into hao
Big-boy mode
Prevent double registration
Merge remote-tracking branch 'github/hao' into drag-and-drop

Conflicts:
	client/Staunton/STNWebSocket.m
remove some unused code