Merge branch 'master' into integration

Conflicts:
	src/applications/sctpapp/SCTPClient.cc
	src/applications/sctpapp/SCTPPeer.cc
	src/battery/ChangeLog
	src/battery/models/ChangeLog
	src/linklayer/ideal/ChangeLog
	src/nodes/inet/ChangeLog
	src/nodes/ipv6/NodeBase6.ned
	src/physicallayer/radio/simplified/ChangeLog
	src/physicallayer/radio/simplified/SimplifiedRadio.ned
	src/physicallayer/radio/simplified/ieee80211/ChangeLog
	src/queue/ChangeLog
	src/transport/sctp/SCTP.cc
	src/transport/sctp/SCTPAssociationBase.cc
	src/transport/sctp/SCTPAssociationUtil.cc
	src/util/headerserializers/sctp/SCTPSerializer.cc
	src/world/radio/ChangeLog
Merge branch 'master' into integration
sctp fixes after merge
EV fix after merge
L2NodeConfigurator: subscribed to NF_INTERFACE_CREATED
STP/RSTP: uses start() in initialize()
STP/RSTP: was uninitialized variables in Ieee8021dInterfaceData