chages by rahul
rahul
Merge branch 'master' of https://github.com/illotum/sdn-fabric

Conflicts:
	fabric.py
aaded by rahul
aaded by rahul