diff --git a/.classpath b/.classpath
index 32c8466..404c62a 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/species-discovery-3.5.1-SNAPSHOT/WEB-INF/classes" path="src/main/java">
+	<classpathentry kind="src" output="target/species-discovery-3.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
@@ -20,7 +20,7 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
@@ -31,5 +31,5 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="output" path="target/species-discovery-3.5.1-SNAPSHOT/WEB-INF/classes"/>
+	<classpathentry kind="output" path="target/species-discovery-3.6.0-SNAPSHOT/WEB-INF/classes"/>
 </classpath>
diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs
index 5c6653c..4841a26 100644
--- a/.settings/com.google.gdt.eclipse.core.prefs
+++ b/.settings/com.google.gdt.eclipse.core.prefs
@@ -1,5 +1,5 @@
 eclipse.preferences.version=1
 jarsExcludedFromWebInfLib=
-lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/speciesdiscovery/target/species-discovery-3.5.1-SNAPSHOT
+lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/speciesdiscovery/target/species-discovery-3.6.0-SNAPSHOT
 warSrcDir=src/main/webapp
 warSrcDirIsOutput=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index 69c31cd..443e085 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index fefc63a..c24712e 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -2,6 +2,6 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.6"/>
   <installed facet="jst.web" version="2.5"/>
+  <installed facet="java" version="1.7"/>
 </faceted-project>
diff --git a/distro/README b/distro/README
index 6c1dd11..9b46176 100644
--- a/distro/README
+++ b/distro/README
@@ -17,7 +17,7 @@ Authors
 
 Version and Release Date
 ------------------------
-v. 3.5.0
+v. 3.6.0
 
 Description
 -----------
diff --git a/distro/changelog.xml b/distro/changelog.xml
index ef8b408..1b8b7d7 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,9 @@
 <ReleaseNotes>
+	<Changeset
+		component="org.gcube.application.speciesmanagement.speciesdiscovery.3-6-0"
+		date="23-04-2014">
+		<Change>Portlet updated to support service updating</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.application.speciesmanagement.speciesdiscovery.3-5-0"
 		date="24-10-2013">
diff --git a/pom.xml b/pom.xml
index f92ed82..229a0bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
 	<groupId>org.gcube.portlets.user</groupId>
 	<artifactId>species-discovery</artifactId>
 	<packaging>war</packaging>
-	<version>3.5.1-SNAPSHOT</version>
+	<version>3.6.0-SNAPSHOT</version>
 	<name>gCube Species Discovery</name>
 	<description>
 		gCube Species Discovery Portlet lets the users discovery species information from the Species Service.
@@ -80,14 +80,14 @@
 			<groupId>org.gcube.data.spd</groupId>
 			<artifactId>spd-client-library</artifactId>
 			<version>[3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT)</version>
-<!-- 			<scope>provided</scope> -->
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.gcube.data.spd</groupId>
 			<artifactId>spql-parser</artifactId>
 			<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
-<!-- 			<scope>provided</scope> -->
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
@@ -144,7 +144,7 @@
 		<dependency>
 			<groupId>org.gcube.portlets.widgets</groupId>
 			<artifactId>workspace-light-tree</artifactId>
-<!-- 			<version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> -->
+			<!-- <version>[2.13.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version> -->
 			<scope>provided</scope>
 		</dependency>
 
@@ -190,6 +190,12 @@
 			<artifactId>accesslogger</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>2.1</version>
+		</dependency>
+		
 		<!-- FWS -->
 		<dependency>
 			<groupId>org.gcube.resources.discovery</groupId>
@@ -201,7 +207,7 @@
 			<artifactId>common-scope-maps</artifactId>
 			<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
 			<!-- UNCOMMENT THIS FOR RELEASE -->
-			<!-- <scope>provided</scope> -->
+			<scope>provided</scope>
 		</dependency>
 		<!-- END FWS -->
 
@@ -347,8 +353,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>2.3.2</version>
 				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 			<!-- SA Plugin -->