added mike mike
Merge remote-tracking branch 'origin/master' into miketest

Conflicts:
	speeqeweb/httpbclient.py