never mind...
friends service, parallel socket server atm
friends service working
friends service done
Merge branch 'friends-list'

Conflicts:
	public/index.html
	server/server.js
integrated friends service
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/audio/AudioService.js
	client/webrtc/webRTCService.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/audio/AudioService.js
integrated friends... not sure audio integration is successful
Merge remote-tracking branch 'origin/master'