- Fixed classpath of org.restlet module
Merge branch 'master' of github.com:restlet/restlet-framework-java

Conflicts:
	modules/org.restlet/.classpath
 - Merged changes
Merge branch 'master' of github.com:restlet/restlet-framework-java