Merge pull request #286 from giact/develop-vs2013

VS 2013.3 needs _WINSOCK_DEPRECATED_NO_WARNINGS for libminiupnpc
Merge branch 'up-develop' into develop