local update
Merge branch 'https_work' of ssh://git@github.com/netmindms/ednio into
https_work

Conflicts:
	src/edssl/EdSmartSocket.cpp