Merge branch 'master' of https://git.gitorious.org/yacy/rc1.git

.classpath

@@ -9,7 +9,6 @@
 	<classpathentry excluding="bookmarks/posts/|bookmarks/|util/|bookmarks/xbel/|bookmarks/tags/|ymarks/" kind="src" path="htroot/api"/>
 	<classpathentry kind="src" path="htroot/api/bookmarks/posts"/>
 	<classpathentry excluding="posts/|xbel/|tags/" kind="src" path="htroot/api/bookmarks"/>
-	<classpathentry kind="src" path="htroot/api/util"/>
 	<classpathentry kind="src" path="htroot/api/bookmarks/xbel"/>
 	<classpathentry kind="src" path="htroot/api/bookmarks/tags"/>
 	<classpathentry kind="src" path="htroot/api/ymarks"/>

htroot/yacy/ui/sidebar/sidebar_1.html

@@ -78,7 +78,7 @@
 				<option value="/yacysearch.json?resource=global&verify=true" selected="selected">freeworld</option>
 				<option value="/yacysearch.json?resource=local&verify=true" >local peer</option>
 				<option value="ymarks" >bookmarks</option>
-				<option value="/api/util/ynetSearch.json?login=&url=http://sciencenet.fzk.de:8080/yacysearch.json?resource=global&verify=true" >sciencenet-ynetSearch</option>
+				<option value="/api/ynetSearch.json?login=&url=http://sciencenet.fzk.de:8080/yacysearch.json?resource=global&verify=true" >sciencenet-ynetSearch</option>
 				<option value="http://sciencenet.fzk.de:8080/yacysearch.json?callback=?&resource=global&verify=true" >sciencenet-JsonP</option>
 				<option value="http://yacy.kicks-ass.net:8080/yacysearch.json?callback=?&resource=global&verify=true" >apfelmaennchen-JsonP</option>							
 			</select>