Enable UPNP by default for stockcoin daemon
Merge branch 'master' of https://github.com/chesbeiner/stockcoin

Conflicts:
	src/makefile.linux-mingw
	src/makefile.mingw
	src/makefile.osx
	src/makefile.unix