Merge of restlet.org and restlet.com