Merge branch 'master' into Arduino_1.5.5

Author: ntruchsess

UIPEthernet/src/UIPServer.h

@@ -23,7 +23,7 @@
 #import "Server.h"
 #import "UIPClient.h"
 
-class UIPServer : Server {
+class UIPServer : public Server {
 
 public:
   UIPServer(uint16_t);