Windows fix
Merge pull request #548 from imapp-pl/pr-fixes

Windows fix
Debug outputs.
Merge remote-tracking branch 'upstream/develop' into newTests
Merge pull request #550 from CJentzsch/newTests

log in state tests
PV46. Minor protocol alterations.
Merge remote-tracking branch 'upstream/develop' into newTests
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

Conflicts:
	test/vm.cpp
Warnings fixes (well.. the UPnP was actually a crash fix.)
Merge remote-tracking branch 'upstream/develop' into newTests
test update due to CALLCODA <-> RETURN