- Fix broken TCP connection when socket poll mechanism is used
https://github.com/openpeer/opandroid/issues/438
Merge remote-tracking branch 'origin/20140401-dev-stable' into feature-20140521-push-messaging

Conflicts:
	libs/op-services-cpp
	libs/zsLib