Merge branch 'EunetSwitch' of github.com:ToshioKotani/ns3-abe into EunetSwitch

Conflicts:
	EunetSwitch/EunetSimulation.cc
	EunetSwitch/Makefile
	EunetSwitch/SimpleSwitch.cc
updated .gitignore