by wanghongqiao
Merge branch 'master' of https://github.com/bcl104/ns3.git

Conflicts:
	src/lifi/wscript
Merge branch 'master' of https://github.com/bcl104/ns3.git

Conflicts:
	src/lifi/wscript