Bluetooth socket preservation
Merge branch 'master' of ssh://github.com/abettadapur/homeauto

Conflicts:
	HomeAutoServer/bt/btcontroller.py
	HomeAutoServer/net/api.pyc