Merge branch 'fixes' of https://github.com/CodeShark/cpp-ethereum into CodeShark-fixes

Conflicts:
	eth/main.cpp
	libethereum/Client.cpp
	libethereum/PeerNetwork.cpp
	test/peer.cpp

libethereum/FileSystem.cpp

@@ -22,6 +22,7 @@
  */
 
 #include "FileSystem.h"
+#include "Common.h"
 
 #ifdef _WIN32
 #include <shlobj.h>

libethereum/UPnP.cpp

@@ -117,7 +117,7 @@ int UPnP::addRedirect(char const* addr, int port)
 	// Failed - now try (random external, port internal) and cycle up to 10 times.
 	for (uint i = 0; i < 10; ++i)
 	{
-		port = random() % 65535 - 1024 + 1024;
+		port = rand() % 65535 - 1024 + 1024;
 		sprintf(port_str, "%d", port);
 		if (!UPNP_AddPortMapping(m_urls->controlURL, m_data->first.servicetype, NULL, port_str, addr, "ethereum", "TCP", NULL, NULL))
 			return port;