compatibility: EV macros for omnet++ 4.x
features: fixed mobility feature
MACAddress: omnet++ 4.x compatibility
IPv4: EV output fixes
module tests: removed 'log-level' settings
version update
updated changelogs for v2.3
smoketest: disable failed tests
SCTP: CMT (Concurrent Multipath Transfer) for SCTP by Thomas Dreibholz
sctp: added SCTP NAT support (by Irene Rungeler)
sctp: ev --> EV
Merge branch 'master' into integration (topic/merge-master-to-integration)

Conflicts:
	.oppfeatures
	src/battery/ChangeLog
	src/battery/models/ChangeLog
	src/linklayer/contract/ChangeLog
	src/linklayer/ideal/ChangeLog
	src/networklayer/common/ChangeLog
	src/networklayer/contract/ChangeLog
	src/networklayer/ipv4/IPv4.cc
	src/nodes/inet/ChangeLog
	src/physicallayer/radio/simplified/ChangeLog
	src/physicallayer/radio/simplified/ieee80211/ChangeLog
	src/queue/ChangeLog
	src/transport/contract/ChangeLog
	src/transport/contract/sctp/SCTPCommand.msg
	src/transport/contract/sctp/SCTPSocket.h
	src/transport/sctp/SCTPAssociationEventProc.cc
	src/transport/sctp/SCTPAssociationUtil.cc
	src/transport/sctp/SCTPMessage.msg
	src/util/headerserializers/sctp/SCTPSerializer.cc
	src/world/radio/ChangeLog
	tests/fingerprint/omnet4/examples.csv
	tests/module/DHCP_lifecycle_2.test
	tests/smoke/examples-TODO.csv_off
	tests/smoke/examples.csv
fixes after merge
BaseConnectionManager: numInitStages()
L2NodeConfigurator: bugfix: should do prepareNode() in INITSTAGE_LINK_LAYER_2

because interface entry registered in INITSTAGE_LINK_LAYER
STP: bugfix: should do initPortTable() in INITSTAGE_LINK_LAYER_2

    because interface entries registered in INITSTAGE_LINK_LAYER