Merge branch 'master' into integration

Conflicts:
	examples/dhcp/WirelessNetWithDHCP.ned
	examples/dhcp/eth/run.cmd
	examples/ieee8021d/run.cmd
	examples/wireless/nic/run
	examples/wireless/nic/run.cmd
	src/applications/dhcp/DHCPClient.cc
	src/applications/dhcp/DHCPClient.h
	src/applications/dhcp/DHCPServer.cc
	src/applications/dhcp/DHCPServer.h
	src/base/INETDefs.h
	src/linklayer/ethernet/EtherEncap.cc
	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/MACRelayUnitPP.cc
	src/linklayer/ethernet/switch/MACRelayUnitPP.h
	src/linklayer/ieee80211/mac/Ieee80211Mac.ned
	src/linklayer/ieee80211/mgmt/Ieee80211AgentSTA.ned
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtAP.ned
	src/linklayer/ieee80211/mgmt/Ieee80211MgmtSTA.ned
	src/networklayer/arp/ARP.ned
	src/networklayer/ipv4/IPv4.cc
	src/nodes/ethernet/EtherSwitch.ned
	src/nodes/ipv6/StandardHost6.ned
	src/nodes/wireless/AccessPoint.ned
	src/physicallayer/radio/ideal/IdealRadio.ned
	tests/fingerprint/omnet4/ethernet-switch.csv
	tests/fingerprint/omnet4/examples.csv
	tests/module/DHCP_2.test
	tests/module/DHCP_lifecycle_2.test
	tests/module/DHCP_lifecycle_3.test
Merge branch 'master' into integration

Conflicts:
	src/networklayer/ipv4/RoutingTableRecorder.cc
	tests/module/DHCP_lifecycle_2.test
fixed init stages after merge
Fixed compilation on Android: - int128: fmodl(long double) doesn't exist on Android (suggested by Ingmar Baumgart)
mobility: MoBANMobility2 example has been simplified - fingerprint changed
-----mobility: added watches -- TODO: the WATCH(coordinator) isn't good
MoBAN mobility: initialization of coordinator changed:

calculate initialposition in INITSTAGE_PHYSICAL_ENVIRONMENT
instead of INITSTAGE_PHYSICAL_ENVIRONMENT_2
--TMP--