couple small bug fixes
Merge remote-tracking branch 'origin/master' into bbb

Conflicts:
	server.js