diff --git a/README.md b/README.md
index 1a66d90..da401d8 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ jappstart is a Java framework for Google App Engine built on Spring, Spring Secu
* URL Rewrite Integration
## Versions
-* Goole App Engine SDK for Java 1.6.0
+* Goole App Engine SDK for Java 1.7.0
* jQuery 1.7.1
* Maven GAE Plugin 0.9.2
* Spring 3.1.0
@@ -116,7 +116,7 @@ Restore:
See the [Google App Engine Blog](http://googlewebtoolkit.blogspot.com/2010/08/how-to-use-google-plugin-for-eclipse.html).
# Copyright
-Copyright (C) 2010 Taylor Leese
+Copyright (C) 2010-2012 Taylor Leese
This file is part of jappstart.
diff --git a/pom.xml b/pom.xml
index 07847fb..aa72981 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
org.slf4j
slf4j-api
${slf4j.version}
-
org.slf4j
log4j-over-slf4j
@@ -373,7 +370,6 @@
-
diff --git a/src/main/java/com/jappstart/controller/AdminController.java b/src/main/java/com/jappstart/controller/AdminController.java
index f018085..23223b2 100644
--- a/src/main/java/com/jappstart/controller/AdminController.java
+++ b/src/main/java/com/jappstart/controller/AdminController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/controller/ErrorController.java b/src/main/java/com/jappstart/controller/ErrorController.java
index cf77807..036c679 100644
--- a/src/main/java/com/jappstart/controller/ErrorController.java
+++ b/src/main/java/com/jappstart/controller/ErrorController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/controller/LoginController.java b/src/main/java/com/jappstart/controller/LoginController.java
index 8131949..3528669 100644
--- a/src/main/java/com/jappstart/controller/LoginController.java
+++ b/src/main/java/com/jappstart/controller/LoginController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/controller/RegisterController.java b/src/main/java/com/jappstart/controller/RegisterController.java
index 7473da4..008590f 100644
--- a/src/main/java/com/jappstart/controller/RegisterController.java
+++ b/src/main/java/com/jappstart/controller/RegisterController.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/controller/package-info.java b/src/main/java/com/jappstart/controller/package-info.java
index 696a5bf..000d62c 100644
--- a/src/main/java/com/jappstart/controller/package-info.java
+++ b/src/main/java/com/jappstart/controller/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/controller/task/MailTask.java b/src/main/java/com/jappstart/controller/task/MailTask.java
index 1cb7662..e47ad35 100644
--- a/src/main/java/com/jappstart/controller/task/MailTask.java
+++ b/src/main/java/com/jappstart/controller/task/MailTask.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/controller/task/package-info.java b/src/main/java/com/jappstart/controller/task/package-info.java
index 08efaf1..2de9bd5 100644
--- a/src/main/java/com/jappstart/controller/task/package-info.java
+++ b/src/main/java/com/jappstart/controller/task/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/exception/DuplicateUserException.java b/src/main/java/com/jappstart/exception/DuplicateUserException.java
index 965f1a4..bf5ea23 100644
--- a/src/main/java/com/jappstart/exception/DuplicateUserException.java
+++ b/src/main/java/com/jappstart/exception/DuplicateUserException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/exception/package-info.java b/src/main/java/com/jappstart/exception/package-info.java
index e44f105..1177adf 100644
--- a/src/main/java/com/jappstart/exception/package-info.java
+++ b/src/main/java/com/jappstart/exception/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/form/Register.java b/src/main/java/com/jappstart/form/Register.java
index 2dd11d2..f91dd1b 100644
--- a/src/main/java/com/jappstart/form/Register.java
+++ b/src/main/java/com/jappstart/form/Register.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/form/package-info.java b/src/main/java/com/jappstart/form/package-info.java
index 61e7c2d..7819426 100644
--- a/src/main/java/com/jappstart/form/package-info.java
+++ b/src/main/java/com/jappstart/form/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/model/auth/PersistentLogin.java b/src/main/java/com/jappstart/model/auth/PersistentLogin.java
index 84bacbb..7186b1e 100644
--- a/src/main/java/com/jappstart/model/auth/PersistentLogin.java
+++ b/src/main/java/com/jappstart/model/auth/PersistentLogin.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/model/auth/PersistentUser.java b/src/main/java/com/jappstart/model/auth/PersistentUser.java
index 583f5b3..1ccb2c8 100644
--- a/src/main/java/com/jappstart/model/auth/PersistentUser.java
+++ b/src/main/java/com/jappstart/model/auth/PersistentUser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/model/auth/UserAccount.java b/src/main/java/com/jappstart/model/auth/UserAccount.java
index 8a997c5..e92840f 100644
--- a/src/main/java/com/jappstart/model/auth/UserAccount.java
+++ b/src/main/java/com/jappstart/model/auth/UserAccount.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/model/auth/package-info.java b/src/main/java/com/jappstart/model/auth/package-info.java
index e5a7844..d777dc0 100644
--- a/src/main/java/com/jappstart/model/auth/package-info.java
+++ b/src/main/java/com/jappstart/model/auth/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/auth/EnhancedUser.java b/src/main/java/com/jappstart/service/auth/EnhancedUser.java
index 37536f7..4d04dff 100644
--- a/src/main/java/com/jappstart/service/auth/EnhancedUser.java
+++ b/src/main/java/com/jappstart/service/auth/EnhancedUser.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/auth/EnhancedUserDetailsService.java b/src/main/java/com/jappstart/service/auth/EnhancedUserDetailsService.java
index 989def3..5e7a217 100644
--- a/src/main/java/com/jappstart/service/auth/EnhancedUserDetailsService.java
+++ b/src/main/java/com/jappstart/service/auth/EnhancedUserDetailsService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/auth/PersistentTokenRepositoryImpl.java b/src/main/java/com/jappstart/service/auth/PersistentTokenRepositoryImpl.java
index 5eb2222..8970477 100644
--- a/src/main/java/com/jappstart/service/auth/PersistentTokenRepositoryImpl.java
+++ b/src/main/java/com/jappstart/service/auth/PersistentTokenRepositoryImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/auth/UserDetailsServiceImpl.java b/src/main/java/com/jappstart/service/auth/UserDetailsServiceImpl.java
index ea5ec55..b16d8d7 100644
--- a/src/main/java/com/jappstart/service/auth/UserDetailsServiceImpl.java
+++ b/src/main/java/com/jappstart/service/auth/UserDetailsServiceImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/auth/package-info.java b/src/main/java/com/jappstart/service/auth/package-info.java
index feb7f1d..b6a318f 100644
--- a/src/main/java/com/jappstart/service/auth/package-info.java
+++ b/src/main/java/com/jappstart/service/auth/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/mail/MailService.java b/src/main/java/com/jappstart/service/mail/MailService.java
index 6283883..c482245 100644
--- a/src/main/java/com/jappstart/service/mail/MailService.java
+++ b/src/main/java/com/jappstart/service/mail/MailService.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/java/com/jappstart/service/mail/package-info.java b/src/main/java/com/jappstart/service/mail/package-info.java
index 202f86d..d8d3d1b 100644
--- a/src/main/java/com/jappstart/service/mail/package-info.java
+++ b/src/main/java/com/jappstart/service/mail/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010 Taylor Leese (tleese22@gmail.com)
+ * Copyright (C) 2010-2012 Taylor Leese (tleese22@gmail.com)
*
* This file is part of jappstart.
*
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
index fd57bed..b05c60d 100644
--- a/src/main/resources/META-INF/persistence.xml
+++ b/src/main/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@