catch socket error and retry later
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/couchbase/collect.py
Add css and js for a better UI