Merge branch 'master' into integration

Conflicts:
	.oppfeatures
	examples/dhcp/WirelessNetWithDHCP.ned
	examples/dhcp/eth/run
	examples/dhcp/eth/run.cmd
	examples/ieee8021d/run.cmd
	examples/manetrouting/dymo/DYMONetwork.ned
	examples/manetrouting/dymo/omnetpp.ini
	examples/manetrouting/gpsr/GPSRNetwork.ned
	examples/manetrouting/gpsr/omnetpp.ini
	examples/mobility/MobileHost.ned
	examples/sctp/cmttest/run
	examples/sctp/cmttest/run.cmd
	examples/traci/Car.ned
	examples/traci_launchd/Car.ned
	examples/wireless/hosttohost/Throughput.ned
	examples/wireless/nic/run
	examples/wireless/nic/run.cmd
	examples/wireless/throughput/Throughput.ned
	examples/wireless/throughput/WirelessAPWithSink.ned
	src/applications/common/ApplicationBase.cc
	src/applications/common/ApplicationBase.h
	src/applications/dhcp/ChangeLog
	src/applications/dhcp/DHCPClient.cc
	src/applications/dhcp/DHCPClient.h
	src/applications/dhcp/DHCPClient.ned
	src/applications/dhcp/DHCPServer.cc
	src/applications/dhcp/DHCPServer.h
	src/applications/dhcp/DHCPServer.ned
	src/applications/ethernet/EtherAppCli.cc
	src/applications/ethernet/EtherAppCli.h
	src/applications/ethernet/EtherAppSrv.cc
	src/applications/ethernet/EtherAppSrv.h
	src/applications/ethernet/EtherTrafGen.cc
	src/applications/ethernet/EtherTrafGen.h
	src/applications/generic/IPvXTrafGen.cc
	src/applications/generic/IPvXTrafGen.h
	src/applications/generic/IPvXTrafSink.cc
	src/applications/generic/IPvXTrafSink.h
	src/applications/httptools/HttpBrowser.h
	src/applications/httptools/HttpBrowserBase.cc
	src/applications/httptools/HttpBrowserBase.h
	src/applications/httptools/HttpBrowserDirect.cc
	src/applications/httptools/HttpBrowserDirect.h
	src/applications/httptools/HttpNodeBase.h
	src/applications/httptools/HttpServer.cc
	src/applications/httptools/HttpServer.h
	src/applications/httptools/HttpServerBase.cc
	src/applications/httptools/HttpServerBase.h
	src/applications/httptools/HttpServerDirect.cc
	src/applications/httptools/HttpServerDirect.h
	src/applications/httptools/HttpServerDirectEvilA.cc
	src/applications/httptools/HttpServerDirectEvilA.h
	src/applications/httptools/HttpServerDirectEvilB.cc
	src/applications/httptools/HttpServerDirectEvilB.h
	src/applications/httptools/HttpServerEvilA.cc
	src/applications/httptools/HttpServerEvilA.h
	src/applications/httptools/HttpServerEvilB.cc
	src/applications/httptools/HttpServerEvilB.h
	src/applications/httptools/HttpUtils.cc
	src/applications/pingapp/PingApp.cc
	src/applications/pingapp/PingApp.h
	src/applications/pingapp/PingTestApp.cc
	src/applications/pingapp/PingTestApp.h
	src/applications/rtpapp/RTPApplication.cc
	src/applications/rtpapp/RTPApplication.h
	src/applications/sctpapp/SCTPClient.cc
	src/applications/sctpapp/SCTPClient.h
	src/applications/sctpapp/SCTPPeer.cc
	src/applications/sctpapp/SCTPPeer.h
	src/applications/sctpapp/SCTPServer.cc
	src/applications/sctpapp/SCTPServer.h
	src/applications/tcpapp/TCPAppBase.cc
	src/applications/tcpapp/TCPAppBase.h
	src/applications/tcpapp/TCPBasicClientApp.cc
	src/applications/tcpapp/TCPBasicClientApp.h
	src/applications/tcpapp/TCPEchoApp.cc
	src/applications/tcpapp/TCPEchoApp.h
	src/applications/tcpapp/TCPGenericSrvApp.cc
	src/applications/tcpapp/TCPGenericSrvApp.h
	src/applications/tcpapp/TCPSessionApp.cc
	src/applications/tcpapp/TCPSessionApp.h
	src/applications/tcpapp/TCPSinkApp.cc
	src/applications/tcpapp/TCPSinkApp.h
	src/applications/tcpapp/TCPSrvHostApp.cc
	src/applications/tcpapp/TCPSrvHostApp.h
	src/applications/tcpapp/TelnetApp.cc
	src/applications/tcpapp/TelnetApp.h
	src/applications/traci/TraCIDemo.cc
	src/applications/traci/TraCIDemo.h
	src/applications/traci/TraCIDemo.ned
	src/applications/traci/TraCITestApp.cc
	src/applications/traci/TraCITestApp.h
	src/applications/traci/TraCITestApp.ned
	src/applications/udpapp/UDPBasicApp.cc
	src/applications/udpapp/UDPBasicApp.h
	src/applications/udpapp/UDPBasicBurst.h
	src/applications/udpapp/UDPEchoApp.cc
	src/applications/udpapp/UDPEchoApp.h
	src/applications/udpapp/UDPSink.cc
	src/applications/udpapp/UDPSink.h
	src/applications/udpapp/UDPVideoStreamCli.h
	src/applications/udpapp/UDPVideoStreamSvr.cc
	src/applications/udpapp/UDPVideoStreamSvr.h
	src/applications/voip/SimpleVoIPReceiver.cc
	src/applications/voip/SimpleVoIPReceiver.h
	src/applications/voip/SimpleVoIPSender.cc
	src/applications/voip/SimpleVoIPSender.h
	src/applications/voipstream/VoIPStreamReceiver.cc
	src/applications/voipstream/VoIPStreamReceiver.h
	src/applications/voipstream/VoIPStreamSender.cc
	src/applications/voipstream/VoIPStreamSender.h
	src/base/ChangeLog
	src/base/Compat.h
	src/base/INETDefs.h
	src/base/OperationalBase.h
	src/battery/ChangeLog
	src/battery/models/ChangeLog
	src/linklayer/IMACRelayUnit.ned
	src/linklayer/common/MACAddress.cc
	src/linklayer/common/MACBase.cc
	src/linklayer/common/MACBase.h
	src/linklayer/common/WirelessMacBase.cc
	src/linklayer/contract/ChangeLog
	src/linklayer/ethernet/EtherEncap.cc
	src/linklayer/ethernet/EtherLLC.cc
	src/linklayer/ethernet/EtherMACBase.cc
	src/linklayer/ethernet/EtherMACBase.h
	src/linklayer/ethernet/switch/MACRelayUnitBase.cc
	src/linklayer/ethernet/switch/MACRelayUnitBase.h
	src/linklayer/ethernet/switch/MACRelayUnitNP.cc
	src/linklayer/ethernet/switch/MACRelayUnitNP.h
	src/linklayer/ethernet/switch/MACRelayUnitNP.ned
	src/linklayer/ethernet/switch/MACRelayUnitPP.cc
	src/linklayer/ethernet/switch/MACRelayUnitPP.h
	src/linklayer/ethernet/switch/MACRelayUnitPP.ned
	src/linklayer/ext/ExtInterface.cc
	src/linklayer/ext/ExtInterface.h
	src/linklayer/ideal/ChangeLog
	src/linklayer/ideal/IdealMac.cc
	src/linklayer/ieee80211/mac/Ieee80211Mac.ned
	src/linklayer/ieee80211/mac/WifiMode.cc
	src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.cc
	src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.h
	src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.ned
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAP.cc
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAP.h
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAP.ned
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAPBase.cc
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAPBase.h
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAPSimplified.h
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAdhoc.h
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtBase.cc
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtBase.h
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtSTA.cc
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtSTA.h
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtSTA.ned
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtSTASimplified.cc
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtSTASimplified.h
	src/linklayer/loopback/Loopback.cc
	src/linklayer/loopback/Loopback.h
	src/linklayer/ppp/PPP.cc
	src/linklayer/ppp/PPP.h
	src/linklayer/radio/IdealRadio.cc
	src/mobility/ChangeLog
	src/mobility/common/MobilityAccess.cc
	src/mobility/common/MobilityAccess.h
	src/mobility/common/MobilityBase.cc
	src/mobility/common/MobilityBase.h
	src/mobility/common/MovingMobilityBase.cc
	src/mobility/group/MoBANCoordinator.cc
	src/mobility/group/MoBANCoordinator.h
	src/mobility/group/MoBANLocal.cc
	src/mobility/group/MoBANLocal.h
	src/mobility/models/MobilityAccess.cc
	src/mobility/models/MobilityAccess.h
	src/mobility/single/ANSimMobility.cc
	src/mobility/single/ANSimMobility.h
	src/mobility/single/BonnMotionMobility.cc
	src/mobility/single/BonnMotionMobility.h
	src/mobility/single/ChiangMobility.cc
	src/mobility/single/ChiangMobility.h
	src/mobility/single/CircleMobility.cc
	src/mobility/single/CircleMobility.h
	src/mobility/single/ConstSpeedMobility.cc
	src/mobility/single/ConstSpeedMobility.h
	src/mobility/single/GaussMarkovMobility.cc
	src/mobility/single/GaussMarkovMobility.h
	src/mobility/single/LinearMobility.cc
	src/mobility/single/LinearMobility.h
	src/mobility/single/LinearNodeDistributionMobility.cc
	src/mobility/single/LinearNodeDistributionMobility.h
	src/mobility/single/MassMobility.cc
	src/mobility/single/MassMobility.h
	src/mobility/single/Ns2MotionMobility.cc
	src/mobility/single/Ns2MotionMobility.h
	src/mobility/single/RandomWPMobility.cc
	src/mobility/single/RandomWPMobility.h
	src/mobility/single/RectangleMobility.cc
	src/mobility/single/RectangleMobility.h
	src/mobility/single/TraCIMobility.cc
	src/mobility/single/TraCIMobility.h
	src/mobility/single/TractorMobility.cc
	src/mobility/single/TractorMobility.h
	src/mobility/single/TurtleMobility.cc
	src/mobility/single/TurtleMobility.h
	src/networklayer/arp/ARP.cc
	src/networklayer/arp/ARP.h
	src/networklayer/arp/ARP.ned
	src/networklayer/arp/ChangeLog
	src/networklayer/autorouting/ipv4/FlatNetworkConfigurator.cc
	src/networklayer/autorouting/ipv4/FlatNetworkConfigurator.h
	src/networklayer/autorouting/ipv4/HostAutoConfigurator.cc
	src/networklayer/autorouting/ipv4/HostAutoConfigurator.h
	src/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.cc
	src/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.h
	src/networklayer/autorouting/ipv4/IPv4NodeConfigurator.cc
	src/networklayer/autorouting/ipv6/FlatNetworkConfigurator6.cc
	src/networklayer/autorouting/ipv6/FlatNetworkConfigurator6.h
	src/networklayer/bgpv4/BGPFSM.cc
	src/networklayer/bgpv4/BGPRouting.cc
	src/networklayer/bgpv4/BGPRoutingTableEntry.h
	src/networklayer/common/ChangeLog
	src/networklayer/common/IInterfaceTable.h
	src/networklayer/common/INetfilter.h
	src/networklayer/common/InterfaceEntry.cc
	src/networklayer/common/InterfaceEntry.h
	src/networklayer/common/InterfaceMatcher.cc
	src/networklayer/common/InterfaceTable.cc
	src/networklayer/common/InterfaceTable.h
	src/networklayer/contract/ChangeLog
	src/networklayer/diffserv/MultiFieldClassifier.cc
	src/networklayer/diffserv/MultiFieldClassifier.h
	src/networklayer/diffserv/SingleRateThreeColorMeter.cc
	src/networklayer/diffserv/SingleRateThreeColorMeter.h
	src/networklayer/diffserv/TokenBucketMeter.cc
	src/networklayer/diffserv/TokenBucketMeter.h
	src/networklayer/diffserv/TwoRateThreeColorMeter.cc
	src/networklayer/diffserv/TwoRateThreeColorMeter.h
	src/networklayer/icmpv6/ICMPv6.cc
	src/networklayer/icmpv6/IPv6NeighbourDiscovery.cc
	src/networklayer/icmpv6/IPv6NeighbourDiscovery.h
	src/networklayer/internetcloud/ChangeLog
	src/networklayer/internetcloud/CloudDelayerBase.cc
	src/networklayer/internetcloud/CloudDelayerBase.h
	src/networklayer/internetcloud/MatrixCloudDelayer.cc
	src/networklayer/internetcloud/MatrixCloudDelayer.h
	src/networklayer/ipv4/ChangeLog
	src/networklayer/ipv4/ICMP.cc
	src/networklayer/ipv4/ICMP.h
	src/networklayer/ipv4/IGMPv2.cc
	src/networklayer/ipv4/IGMPv2.h
	src/networklayer/ipv4/IPv4.cc
	src/networklayer/ipv4/IPv4.h
	src/networklayer/ipv4/IPv4.ned
	src/networklayer/ipv4/IPv4InterfaceData.cc
	src/networklayer/ipv4/IPv4Route.cc
	src/networklayer/ipv4/IPv4Route.h
	src/networklayer/ipv4/IPv4RoutingTable.cc
	src/networklayer/ipv4/NetworkInfo.cc
	src/networklayer/ipv4/RoutingTableParser.cc
	src/networklayer/ipv4/RoutingTableRecorder.cc
	src/networklayer/ipv4/RoutingTableRecorder.h
	src/networklayer/ipv6/IPv6.cc
	src/networklayer/ipv6/IPv6.h
	src/networklayer/ipv6/IPv6Datagram.h
	src/networklayer/ipv6/IPv6NetworkLayer.ned
	src/networklayer/ipv6tunneling/IPv6Tunneling.cc
	src/networklayer/ipv6tunneling/IPv6Tunneling.ned
	src/networklayer/ldp/LDP.cc
	src/networklayer/ldp/LDP.h
	src/networklayer/manetrouting/aodv/aodv_msg_struct.cc
	src/networklayer/manetrouting/aodv/aodv_uu_omnet.cc
	src/networklayer/manetrouting/aodv/aodv_uu_omnet.h
	src/networklayer/manetrouting/aodv/packet_queue_omnet.cc
	src/networklayer/manetrouting/base/ManetNetfilterHook.cc
	src/networklayer/manetrouting/base/ManetNetfilterHook.h
	src/networklayer/manetrouting/base/ManetRoutingBase.cc
	src/networklayer/manetrouting/base/ManetRoutingBase.h
	src/networklayer/manetrouting/batman/BatmanMain.cc
	src/networklayer/manetrouting/batman/BatmanMain.h
	src/networklayer/manetrouting/dsdv/DSDV_2.cc
	src/networklayer/manetrouting/dsdv/DSDV_2.h
	src/networklayer/manetrouting/dsr/dsr-uu-omnetpp.cc
	src/networklayer/manetrouting/dsr/dsr-uu-omnetpp.h
	src/networklayer/manetrouting/dymo/dymo_um_omnet.cc
	src/networklayer/manetrouting/dymo/dymo_um_omnet.h
	src/networklayer/manetrouting/dymo_fau/DYMO.cc
	src/networklayer/manetrouting/dymo_fau/DYMO.h
	src/networklayer/manetrouting/olsr/OLSR.cc
	src/networklayer/manetrouting/olsr/OLSR.h
	src/networklayer/manetrouting/olsr/OLSR_ETX.cc
	src/networklayer/mpls/LIBTable.cc
	src/networklayer/mpls/LIBTable.h
	src/networklayer/mpls/MPLS.cc
	src/networklayer/mpls/MPLS.h
	src/networklayer/multi/MultiNetworkLayerLowerMultiplexer.h
	src/networklayer/ospfv2/OSPFRouting.cc
	src/networklayer/ospfv2/OSPFRouting.h
	src/networklayer/ospfv2/router/OSPFRouter.cc
	src/networklayer/ospfv2/router/OSPFRoutingTableEntry.cc
	src/networklayer/routing/dymo/DYMO.msg
	src/networklayer/routing/dymo/DYMORouteData.h
	src/networklayer/routing/dymo/xDYMO.cc
	src/networklayer/routing/dymo/xDYMO.h
	src/networklayer/routing/dymo/xDYMO.ned
	src/networklayer/routing/gpsr/GPSR.cc
	src/networklayer/routing/gpsr/GPSR.h
	src/networklayer/routing/gpsr/GPSR.msg
	src/networklayer/routing/gpsr/GPSR.ned
	src/networklayer/routing/gpsr/PositionTable.cc
	src/networklayer/routing/gpsr/PositionTable.h
	src/networklayer/routing/rip/RIPPacket.msg
	src/networklayer/routing/rip/RIPRouting.cc
	src/networklayer/routing/rip/RIPRouting.h
	src/networklayer/routing/rip/RIPRouting.ned
	src/networklayer/rsvp_te/RSVP.cc
	src/networklayer/rsvp_te/RSVP.h
	src/networklayer/rsvp_te/SimpleClassifier.cc
	src/networklayer/rsvp_te/SimpleClassifier.h
	src/networklayer/ted/LinkStateRouting.cc
	src/networklayer/ted/LinkStateRouting.h
	src/networklayer/ted/TED.cc
	src/networklayer/ted/TED.h
	src/networklayer/xmipv6/xMIPv6.cc
	src/networklayer/xmipv6/xMIPv6.h
	src/nodes/ethernet/EtherSwitch.ned
	src/nodes/inet/ChangeLog
	src/nodes/inet/NetworkLayer.ned
	src/nodes/inet/NodeBase.ned
	src/nodes/inet/Router.ned
	src/nodes/ipv6/StandardHost6.ned
	src/nodes/wireless/AccessPoint.ned
	src/physicallayer/radio/ideal/IdealRadio.ned
	src/physicallayer/radio/simplified/ChangeLog
	src/physicallayer/radio/simplified/SimplifiedRadio.cc
	src/physicallayer/radio/simplified/SimplifiedRadioChannelAccess.cc
	src/physicallayer/radio/simplified/ieee80211/ChangeLog
	src/queue/ChangeLog
	src/status/NodeStatus.cc
	src/status/NodeStatus.h
	src/transport/contract/ChangeLog
	src/transport/contract/sctp/SCTPCommand.msg
	src/transport/contract/sctp/SCTPSocket.h
	src/transport/contract/udp/UDPControlInfo.msg
	src/transport/contract/udp/UDPSocket.cc
	src/transport/contract/udp/UDPSocket.h
	src/transport/rtp/RTCP.cc
	src/transport/rtp/RTP.cc
	src/transport/sctp/SCTP.cc
	src/transport/sctp/SCTPAssociationBase.cc
	src/transport/sctp/SCTPAssociationEventProc.cc
	src/transport/sctp/SCTPAssociationRcvMessage.cc
	src/transport/sctp/SCTPAssociationSendAll.cc
	src/transport/sctp/SCTPAssociationUtil.cc
	src/transport/sctp/SCTPCCFunctions.cc
	src/transport/sctp/SCTPMessage.msg
	src/transport/tcp/TCP.cc
	src/transport/tcp_lwip/TCP_lwIP.cc
	src/transport/tcp_nsc/TCP_NSC.cc
	src/transport/udp/UDP.cc
	src/util/headerserializers/sctp/SCTPSerializer.cc
	src/world/httptools/HttpController.cc
	src/world/httptools/HttpController.h
	src/world/obstacles/ObstacleControl.cc
	src/world/obstacles/ObstacleControl.h
	src/world/obstacles/ObstacleControl.ned
	src/world/radio/ChangeLog
	src/world/radio/IdealChannelModelAccess.cc
	src/world/traci/TraCIScenarioManager.cc
	src/world/traci/TraCIScenarioManager.h
	src/world/traci/TraCIScenarioManagerLaunchd.cc
	tests/fingerprint/omnet4/ethernet-switch.csv
	tests/fingerprint/omnet4/examples.csv
	tests/fingerprint/omnet4/manet.csv
	tests/module/DHCP_lifecycle_2.test
	tests/module/DHCP_lifecycle_3.test
	tests/module/lib/TCPTester.cc
	tests/module/lib/TestIGMP.cc
	tests/module/lib/TestIGMP.ned
	tests/module/rip_1.test
	tests/smoke/examples-TODO.csv_off
	tests/smoke/examples.csv