diff --git a/pom.xml b/pom.xml
index b9adafd3..d07e5279 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jvnet.jaxb2.maven2</groupId>
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index a5f7aec0..4efecbbd 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -496,27 +496,26 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.3</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals><goal>copy</goal></goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.mortbay.jetty</groupId>
-                                    <artifactId>jetty-runner</artifactId>
-                                    <version>7.4.5.v20110725</version>
-                                    <destFileName>jetty-runner.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            <!--<plugin>-->
+                <!--<groupId>org.apache.maven.plugins</groupId>-->
+                <!--<artifactId>maven-dependency-plugin</artifactId>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals><goal>copy</goal></goals>-->
+                        <!--<configuration>-->
+                            <!--<artifactItems>-->
+                                <!--<artifactItem>-->
+                                    <!--<groupId>org.mortbay.jetty</groupId>-->
+                                    <!--<artifactId>jetty-runner</artifactId>-->
+                                    <!--<version>7.4.5.v20110725</version>-->
+                                    <!--<destFileName>jetty-runner.jar</destFileName>-->
+                                <!--</artifactItem>-->
+                            <!--</artifactItems>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
 
             <plugin>
                 <groupId>org.jvnet.jaxb2.maven2</groupId>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/prod.properties b/wise-webapp/src/main/webapp/WEB-INF/prod.properties
index 824f7201..875ceec9 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/prod.properties
+++ b/wise-webapp/src/main/webapp/WEB-INF/prod.properties
@@ -23,14 +23,26 @@ database.password=${DATABASE_PASSWORD}
 #------------------------
 # Plain SMTP Server Configuration
 #------------------------
-mail.smtp.port=25
-mail.smtp.host=localhost
-mail.username=root
-mail.password=
-mail.smtp.auth=false
-mail.smtp.starttls.enable=false
+#mail.smtp.port=25
+#mail.smtp.host=localhost
+#mail.username=root
+#mail.password=
+#mail.smtp.auth=false
+#mail.smtp.starttls.enable=false
+#mail.smtp.quitwait=false
+
+#------------------------
+# Sendgrid Configuration
+#------------------------
+mail.smtp.port=587
+mail.smtp.host=smtp.sendgrid.net
+mail.username=app6795136@heroku.com
+mail.password=Your Password
+mail.smtp.auth=true
+mail.smtp.starttls.enable=true
 mail.smtp.quitwait=false
 
+
 #------------------------
 # SSL SMTP Server Configuration
 #------------------------