addedm othing
Merge remote-tracking branch 'origin/master' into miketest

Conflicts:
	speeqeweb/httpbclient.py
this final line
Merge remote-tracking branch 'origin/miketest'

Conflicts:
	speeqeweb/httpbclient.py