update socketio to 1.2.0
conflict resolution
Merge branch 'dbackowski-1.2.0'