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