Merging fonera listener and client into server.
Merging fonera listener and client into server.