removed submodule inetmanet from project
added submodule inetmanet-2.0 (name is inetmanet) to project
replaced usage of 'IPAddress' with 'IPv4Address'
renamed package import of InetSimpleBattery in OMNeTBattery
playground is not part of channelcontrol anymore (moved to mobility)
Fixed channel control name
The node needs the @node annotation property for inet2.0
General cleanup of the NetworkNode.ned
Updated inetmanet submodule
Directly connected the ARP gates to the NIC (required by inetmanet2.0)
Fixed include for IPv4Address
Merge branch 'inetmanet2.0' into develop

Fixes #33
added ned file for nodes and set node mobility settings
added a few coments to the omnetpp.ini file
removed macro fom TrafficGenerator header
removed header for class TrafficGenerator
fixe channel control issue in scneario
Merge branch 'scenario' of github.com:des-testbed/Ara-Sim into scenario

Conflicts:
	omnetpp/NetworkNode.ned
	simulations/araPaperEvaluation.ned
	simulations/omnetpp.ini