Merge branch 'dev' into simutools2016

DNI3/ant/Trace.model

DNI3/ant/dni-to-mini-dni.xml

DNI3/ant/old/DOALL-QPNs-Juergen.xml

DNI3/ant/old/DOALL-QPNs.xml

DNI3/ant/old/DOALL.xml

DNI3/ant/old/Routing-m2m.xml

DNI3/ant/old/copy.xml

DNI3/ant/old/dni-to-qpn.xml

DNI3/ant/old/dni-to-qpn2.xml

DNI3/ant/old/gen-dnimm3emfatic.xml

DNI3/ant/old/remove_branches_only.xml

DNI3/ant/old/to_OMNET_only.xml

DNI3/ant/old/transform_extracted.xml

DNI3/ant/old/transform_extracted_routing_only.xml

DNI3/ant/old/transform_extracted_to_OMNET.xml

DNI3/ant/simutools_DNI-2-QPN_base.xml

DNI3/common-egl/omnet/ipconfig.xml

DNI3/common-egl/qpme/qpme-spec.qpe

DNI3/egl/omnet-driver.egl

DNI3/egl/omnet-ini.egl