Merge branch 'combobuild' of https://github.com/karinachan/savethenet into combobuild

Conflicts:
	connection.py
	connection.pyc
fix