Switching from Ivy+Ant to Maven.

245 files changed, 245 insertions, 149 deletions

diff --git a/.gitignore b/.gitignore
index 7e32fa1..14412d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
-build
+target/
 out/
 lib
 *.swp
 .idea
 *.iml
+service.log
 devfiles/grow-server.properties
diff --git a/.travis.yml b/.travis.yml
index 35dc598..9bcf999 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
 language: java
 jdk:
   - oraclejdk8
-before_install: "./devfiles/scripts/get-build-tools.sh"
-install: "ant resolve test"
diff --git a/README.md b/README.md
index 6852640..f67ca04 100644
--- a/README.md
+++ b/README.md
@@ -6,21 +6,16 @@ This is the source for the [Foursquare GROW](http://foursquaregrow.com) Website.
 Requirements
 --------------
 
-* JDK 1.7
-* Ant
-* Ivy
-* jesterpm-build-tools
-
+* JDK 1.8
+* Maven
 
 Usage
 -------
 
-1. Download and bootstrap jesterpm-build-tools from http://github.com/jesterpm/jesterpm-build-tools
-2. Copy devfiles/grow-server.properties.default to devfiles/grow-server.properties and insert your
-   AWS and F1 credentials.
-3. Run `ant resolve` to download the dependencies.
-4. Run `ant server` to start the website on http://localhost:8085
-
-The website defaults to running in dev mode which will only modify the dev Dynamo tables. You can
-also run `ant server-prod` to cause the local website to access the production site's Dyanmo
-tables.
+1. Copy devfiles/grow-server.properties.default to devfiles/grow-server.properties and insert your
+   AWS and F1 or CCB credentials.
+2. Run `maven compile` to compile.
+3. Run `maven exec:exec` to start the website on http://localhost:8085
+   The website defaults to running in dev mode which will only modify the dev Dynamo tables.
+   You *must recompile* for changes to take effect.
+4. Run `maven war:war` to produce a war file to deploy.
diff --git a/build.xml b/build.xml
deleted file mode 100644
index be2a325..0000000
--- a/build.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<project name="grow-frontend" default="build" basedir=".">
-
-    <property name="java.target.version" value="1.8" />
-
-    <property name="main.class" value="com.p4square.grow.frontend.GrowFrontend" />
-
-    <property name="deploy.manager.url" value="http://californium.jesterpm.net:9090/manager/text" />
-    <property name="deploy.manager.username" value="deploymentscript" />
-    <property name="deploy.context.path" value="/grow-frontend" />
-
-    <property file="${user.home}/.jesterpm-build-tools.properties" />
-    <property name="jesterpm.buildtools.root" value="../jesterpm-build-tools" />
-    <import file="${jesterpm.buildtools.root}/ant/tomcat-common.xml" />
-
-    <!-- Targets to get this project ready -->
-    <target name="bootstrap" depends="setup-tomcat" />
-
-    <target name="compile" depends="gitrevision,build-common.compile">
-        <copy file="src/templates/templates/gitversion.ftl" tofile="${build.dir}/${build.classes}/templates/templates/gitversion.ftl" overwrite="yes">
-            <filterchain>
-                <replacetokens>
-                    <token key="repository.version" value="${repository.version}" />
-                </replacetokens>
-            </filterchain>
-        </copy>
-    </target>
-
-    <target name="server" depends="compile">
-        <java classname="com.p4square.grow.GrowProcessComponent"
-            classpathref="classpath.run" fork="true">
-
-            <arg file="devfiles/grow-server.properties" />
-        </java>
-    </target>
-
-    <target name="server-prod" depends="compile">
-        <java classname="com.p4square.grow.GrowProcessComponent"
-            classpathref="classpath.run" fork="true">
-
-            <arg file="devfiles/grow-server.properties" />
-            <arg value="serverprod" />
-        </java>
-    </target>
-
-    <target name="frontend" depends="compile">
-        <java classname="com.p4square.grow.frontend.GrowFrontend"
-            classpathref="classpath.run" fork="true">
-
-            <arg file="devfiles/grow-server.properties" />
-        </java>
-    </target>
-
-    <target name="backend" depends="compile">
-        <java classname="com.p4square.grow.backend.GrowBackend"
-            classpathref="classpath.run" fork="true">
-
-            <arg file="devfiles/grow-server.properties" />
-        </java>
-    </target>
-
-</project>
diff --git a/ivy.xml b/ivy.xml
deleted file mode 100644
index 2953b42..0000000
--- a/ivy.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<ivy-module version="2.0" xmlns:m="http://ant.apache.org/ivy/maven">
-    <info organisation="com.p4square.grow" module="frontend" revision="1.0-snapshot" />
-
-    <configurations>
-        <conf name="default" />
-        <conf name="build" extends="default" />
-        <conf name="test" extends="default" />
-        <conf name="runtime" extends="default" />
-        <conf name="sources" />
-    </configurations>
-
-    <publications>
-        <artifact type="pom" ext="pom" conf="default" />
-        <artifact type="jar" ext="jar" conf="default" />
-        <artifact type="source" ext="jar" conf="sources" m:classifier="sources" />
-    </publications>
-
-    <dependencies defaultconfmapping="*->default">
-        <dependency org="org.restlet.jee" name="org.restlet" rev="[2.2-M5]" conf="default" />
-        <dependency org="org.restlet.jee" name="org.restlet.ext.servlet" rev="[2.2-M5]" conf="default" />
-        <dependency org="org.restlet.jee" name="org.restlet.ext.jackson" rev="[2.2-M5]" conf="default" />
-        <dependency org="org.restlet.jee" name="org.restlet.ext.freemarker" rev="[2.2-M5]" conf="default" />
-        <dependency org="org.restlet.jee" name="org.restlet.ext.httpclient" rev="[2.2-M5]" conf="default" />
-
-        <dependency org="log4j" name="log4j" rev="[1.2,)" conf="default" />
-
-        <dependency org="com.p4square" name="ccbapi" rev="1.0" conf="default" />
-
-        <dependency org="junit" name="junit" rev="4.7" conf="test" />
-        <dependency org="org.easymock" name="easymock" rev="3.4" conf="test" />
-        <dependency org="net.sourceforge.cobertura" name="cobertura" rev="2.1.1" conf="test" />
-
-        <!-- Backend Dependencies -->
-        <dependency org="com.netflix.astyanax" name="astyanax-core" rev="[1.0,)" conf="default" />
-        <dependency org="com.netflix.astyanax" name="astyanax-thrift" rev="[1.0,)" conf="default" />
-        <dependency org="com.netflix.astyanax" name="astyanax-cassandra" rev="[1.0,)" conf="default" />
-        <dependency org="com.amazonaws" name="aws-java-sdk" rev="[1.7.8,)" conf="default" />
-
-        <dependency org="io.dropwizard.metrics" name="metrics-core" rev="3.1.0" conf="default" />
-        <dependency org="io.dropwizard.metrics" name="metrics-json" rev="3.1.0" conf="default" />
-    </dependencies>
-</ivy-module>
diff --git a/ivysettings.xml b/ivysettings.xml
deleted file mode 100644
index 177bd80..0000000
--- a/ivysettings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<ivysettings>
-    <settings defaultResolver="default"/>
-    <resolvers>
-        <chain name="default">
-            <ibiblio name="central" m2compatible="true"/>
-
-            <ibiblio name="local-m2" m2compatible="true" root="file://${user.home}/.m2/repository" />
-        </chain>
-
-        <filesystem name="local-m2-publish" m2compatible="true">
-            <artifact pattern="${user.home}/.m2/repository/[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]" />
-        </filesystem>
-
-        <ibiblio name="org.restlet" m2compatible="true" root="http://maven.restlet.org"/>
-    </resolvers>
-
-    <modules>
-        <module organisation="org.restlet.*" resolver="org.restlet" />
-    </modules>
-</ivysettings>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..0d23cd9
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.p4square</groupId>
+    <artifactId>foursquare-grow</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <name>foursquare-grow</name>
+    <description>The Foursquare Grow Website</description>
+    <url>https://github.com/PuyallupFoursquare/foursquare-grow</url>
+
+    <developers>
+        <developer>
+            <name>Jesse Morgan</name>
+            <email>jesse@jesterpm.net</email>
+        </developer>
+    </developers>
+
+    <repositories>
+        <repository>
+            <id>org.restlet</id>
+            <name>org.restlet</name>
+            <url>http://maven.restlet.org</url>
+        </repository>
+    </repositories>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.amazonaws</groupId>
+                <artifactId>aws-java-sdk-bom</artifactId>
+                <version>1.10.62</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>[1.2,)</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet</artifactId>
+            <version>[2.2-M5]</version>
+        </dependency>
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.servlet</artifactId>
+            <version>[2.2-M5]</version>
+        </dependency>
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.jackson</artifactId>
+            <version>[2.2-M5]</version>
+        </dependency>
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.freemarker</artifactId>
+            <version>[2.2-M5]</version>
+        </dependency>
+        <dependency>
+            <groupId>org.restlet.jee</groupId>
+            <artifactId>org.restlet.ext.httpclient</artifactId>
+            <version>[2.2-M5]</version>
+        </dependency>
+
+        <!-- Backend Dependencies -->
+        <dependency>
+            <groupId>com.netflix.astyanax</groupId>
+            <artifactId>astyanax-core</artifactId>
+            <version>1.56.49</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.astyanax</groupId>
+            <artifactId>astyanax-thrift</artifactId>
+            <version>1.56.49</version>
+        </dependency>
+        <dependency>
+            <groupId>com.netflix.astyanax</groupId>
+            <artifactId>astyanax-cassandra</artifactId>
+            <version>1.56.49</version>
+        </dependency>
+        <dependency>
+            <groupId>com.amazonaws</groupId>
+            <artifactId>aws-java-sdk-dynamodb</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-core</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.dropwizard.metrics</groupId>
+            <artifactId>metrics-json</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.p4square</groupId>
+            <artifactId>ccbapi</artifactId>
+            <version>[1.0,)</version>
+        </dependency>
+
+        <!-- These are here to fix conflicts between different packages. -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.6</version>
+        </dependency>
+        <dependency>
+          <groupId>joda-time</groupId>
+          <artifactId>joda-time</artifactId>
+          <version>2.8.1</version>
+        </dependency>
+
+        <!-- Test Dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.easymock</groupId>
+            <artifactId>easymock</artifactId>
+            <version>3.4</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>false</filtering>
+                <excludes>
+                    <exclude>templates/templates/gitversion.ftl</exclude>
+                </excludes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+                <includes>
+                    <include>templates/templates/gitversion.ftl</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.5.1</version>
+                <configuration>
+                    <!-- or whatever version you use -->
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>com.lukegb.mojo</groupId>
+                <artifactId>gitdescribe-maven-plugin</artifactId>
+                <version>3.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>gitdescribe</goal>
+                        </goals>
+                        <id>git-describe</id>
+                        <phase>initialize</phase>
+                        <configuration>
+                            <extraArguments>
+                                <param>--always</param>
+                                <param>--dirty</param>
+                                <param>--tags</param>
+                            </extraArguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.4.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>java</executable>
+                    <arguments>
+                        <argument>-classpath</argument>
+                        <classpath/>
+                        <argument>com.p4square.grow.GrowProcessComponent</argument>
+                        <argument>devfiles/grow-server.properties</argument>
+                    </arguments>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <scm>
+        <connection>scm:git:git@github.com:PuyallupFoursquare/foursquare-grow.git</connection>
+        <url>scm:git:git@github.com:PuyallupFoursquare/foursquare-grow.git</url>
+        <developerConnection>scm:git:git@github.com:PuyallupFoursquare/foursquare-grow.git</developerConnection>
+    </scm>
+
+</project>
diff --git a/src/com/p4square/f1oauth/Attribute.java b/src/main/java/com/p4square/f1oauth/Attribute.java
index 64f2507..64f2507 100644
--- a/src/com/p4square/f1oauth/Attribute.java
+++ b/src/main/java/com/p4square/f1oauth/Attribute.java
diff --git a/src/com/p4square/f1oauth/F1API.java b/src/main/java/com/p4square/f1oauth/F1API.java
index a525c3f..a525c3f 100644
--- a/src/com/p4square/f1oauth/F1API.java
+++ b/src/main/java/com/p4square/f1oauth/F1API.java
diff --git a/src/com/p4square/f1oauth/F1Access.java b/src/main/java/com/p4square/f1oauth/F1Access.java
index c3307f1..c3307f1 100644
--- a/src/com/p4square/f1oauth/F1Access.java
+++ b/src/main/java/com/p4square/f1oauth/F1Access.java
diff --git a/src/com/p4square/f1oauth/F1Exception.java b/src/main/java/com/p4square/f1oauth/F1Exception.java
index 54c1a77..54c1a77 100644
--- a/src/com/p4square/f1oauth/F1Exception.java
+++ b/src/main/java/com/p4square/f1oauth/F1Exception.java
diff --git a/src/com/p4square/f1oauth/F1ProgressReporter.java b/src/main/java/com/p4square/f1oauth/F1ProgressReporter.java
index 8382020..8382020 100644
--- a/src/com/p4square/f1oauth/F1ProgressReporter.java
+++ b/src/main/java/com/p4square/f1oauth/F1ProgressReporter.java
diff --git a/src/com/p4square/f1oauth/F1User.java b/src/main/java/com/p4square/f1oauth/F1User.java
index e5ab487..e5ab487 100644
--- a/src/com/p4square/f1oauth/F1User.java
+++ b/src/main/java/com/p4square/f1oauth/F1User.java
diff --git a/src/com/p4square/f1oauth/FellowshipOneIntegrationDriver.java b/src/main/java/com/p4square/f1oauth/FellowshipOneIntegrationDriver.java
index 865f5d6..865f5d6 100644
--- a/src/com/p4square/f1oauth/FellowshipOneIntegrationDriver.java
+++ b/src/main/java/com/p4square/f1oauth/FellowshipOneIntegrationDriver.java
diff --git a/src/com/p4square/f1oauth/SecondPartyAuthenticator.java b/src/main/java/com/p4square/f1oauth/SecondPartyAuthenticator.java
index 8deefec..8deefec 100644
--- a/src/com/p4square/f1oauth/SecondPartyAuthenticator.java
+++ b/src/main/java/com/p4square/f1oauth/SecondPartyAuthenticator.java
diff --git a/src/com/p4square/f1oauth/SecondPartyVerifier.java b/src/main/java/com/p4square/f1oauth/SecondPartyVerifier.java
index 882c7e7..882c7e7 100644
--- a/src/com/p4square/f1oauth/SecondPartyVerifier.java
+++ b/src/main/java/com/p4square/f1oauth/SecondPartyVerifier.java
diff --git a/src/com/p4square/fmfacade/FMFacade.java b/src/main/java/com/p4square/fmfacade/FMFacade.java
index 0e552b0..0e552b0 100644
--- a/src/com/p4square/fmfacade/FMFacade.java
+++ b/src/main/java/com/p4square/fmfacade/FMFacade.java
diff --git a/src/com/p4square/fmfacade/FreeMarkerPageResource.java b/src/main/java/com/p4square/fmfacade/FreeMarkerPageResource.java
index 8c8948a..8c8948a 100644
--- a/src/com/p4square/fmfacade/FreeMarkerPageResource.java
+++ b/src/main/java/com/p4square/fmfacade/FreeMarkerPageResource.java
diff --git a/src/com/p4square/fmfacade/ftl/GetMethod.java b/src/main/java/com/p4square/fmfacade/ftl/GetMethod.java
index a47c4b0..a47c4b0 100644
--- a/src/com/p4square/fmfacade/ftl/GetMethod.java
+++ b/src/main/java/com/p4square/fmfacade/ftl/GetMethod.java
diff --git a/src/com/p4square/fmfacade/json/ClientException.java b/src/main/java/com/p4square/fmfacade/json/ClientException.java
index c233193..c233193 100644
--- a/src/com/p4square/fmfacade/json/ClientException.java
+++ b/src/main/java/com/p4square/fmfacade/json/ClientException.java
diff --git a/src/com/p4square/fmfacade/json/JsonRequestClient.java b/src/main/java/com/p4square/fmfacade/json/JsonRequestClient.java
index 19a394f..19a394f 100644
--- a/src/com/p4square/fmfacade/json/JsonRequestClient.java
+++ b/src/main/java/com/p4square/fmfacade/json/JsonRequestClient.java
diff --git a/src/com/p4square/fmfacade/json/JsonResponse.java b/src/main/java/com/p4square/fmfacade/json/JsonResponse.java
index b9cb587..b9cb587 100644
--- a/src/com/p4square/fmfacade/json/JsonResponse.java
+++ b/src/main/java/com/p4square/fmfacade/json/JsonResponse.java
diff --git a/src/com/p4square/grow/GrowProcessComponent.java b/src/main/java/com/p4square/grow/GrowProcessComponent.java
index f63538c..608ec0d 100644
--- a/src/com/p4square/grow/GrowProcessComponent.java
+++ b/src/main/java/com/p4square/grow/GrowProcessComponent.java
@@ -120,12 +120,12 @@ public class GrowProcessComponent extends Component {
 
         // Static content
         try {
-            component.getDefaultHost().attach("/images/", new FileServingApp("./build/root/images/"));
-            component.getDefaultHost().attach("/scripts", new FileServingApp("./build/root/scripts"));
-            component.getDefaultHost().attach("/style.css", new FileServingApp("./build/root/style.css"));
-            component.getDefaultHost().attach("/favicon.ico", new FileServingApp("./build/root/favicon.ico"));
-            component.getDefaultHost().attach("/notfound.html", new FileServingApp("./build/root/notfound.html"));
-            component.getDefaultHost().attach("/error.html", new FileServingApp("./build/root/error.html"));
+            component.getDefaultHost().attach("/images/", new FileServingApp("./src/main/webapp/images/"));
+            component.getDefaultHost().attach("/scripts", new FileServingApp("./src/main/webapp/scripts"));
+            component.getDefaultHost().attach("/style.css", new FileServingApp("./src/main/webapp/style.css"));
+            component.getDefaultHost().attach("/favicon.ico", new FileServingApp("./src/main/webapp/favicon.ico"));
+            component.getDefaultHost().attach("/notfound.html", new FileServingApp("./src/main/webapp/notfound.html"));
+            component.getDefaultHost().attach("/error.html", new FileServingApp("./src/main/webapp/error.html"));
         } catch (IOException e) {
             LOG.error("Could not create directory for static resources: "
                     + e.getMessage(), e);
diff --git a/src/com/p4square/grow/backend/BackendVerifier.java b/src/main/java/com/p4square/grow/backend/BackendVerifier.java
index 83160a9..83160a9 100644
--- a/src/com/p4square/grow/backend/BackendVerifier.java
+++ b/src/main/java/com/p4square/grow/backend/BackendVerifier.java
diff --git a/src/com/p4square/grow/backend/CassandraGrowData.java b/src/main/java/com/p4square/grow/backend/CassandraGrowData.java
index 22a7716..22a7716 100644
--- a/src/com/p4square/grow/backend/CassandraGrowData.java
+++ b/src/main/java/com/p4square/grow/backend/CassandraGrowData.java
diff --git a/src/com/p4square/grow/backend/DynamoGrowData.java b/src/main/java/com/p4square/grow/backend/DynamoGrowData.java
index 3b38eac..3b38eac 100644
--- a/src/com/p4square/grow/backend/DynamoGrowData.java
+++ b/src/main/java/com/p4square/grow/backend/DynamoGrowData.java
diff --git a/src/com/p4square/grow/backend/GrowBackend.java b/src/main/java/com/p4square/grow/backend/GrowBackend.java
index 4091138..4091138 100644
--- a/src/com/p4square/grow/backend/GrowBackend.java
+++ b/src/main/java/com/p4square/grow/backend/GrowBackend.java
diff --git a/src/com/p4square/grow/backend/GrowData.java b/src/main/java/com/p4square/grow/backend/GrowData.java
index 293bb88..293bb88 100644
--- a/src/com/p4square/grow/backend/GrowData.java
+++ b/src/main/java/com/p4square/grow/backend/GrowData.java
diff --git a/src/com/p4square/grow/backend/db/CassandraCollectionProvider.java b/src/main/java/com/p4square/grow/backend/db/CassandraCollectionProvider.java
index bfcb48d..bfcb48d 100644
--- a/src/com/p4square/grow/backend/db/CassandraCollectionProvider.java
+++ b/src/main/java/com/p4square/grow/backend/db/CassandraCollectionProvider.java
diff --git a/src/com/p4square/grow/backend/db/CassandraDatabase.java b/src/main/java/com/p4square/grow/backend/db/CassandraDatabase.java
index b8cb6df..b8cb6df 100644
--- a/src/com/p4square/grow/backend/db/CassandraDatabase.java
+++ b/src/main/java/com/p4square/grow/backend/db/CassandraDatabase.java
diff --git a/src/com/p4square/grow/backend/db/CassandraKey.java b/src/main/java/com/p4square/grow/backend/db/CassandraKey.java
index 853fe96..853fe96 100644
--- a/src/com/p4square/grow/backend/db/CassandraKey.java
+++ b/src/main/java/com/p4square/grow/backend/db/CassandraKey.java
diff --git a/src/com/p4square/grow/backend/db/CassandraProviderImpl.java b/src/main/java/com/p4square/grow/backend/db/CassandraProviderImpl.java
index da5a9f2..da5a9f2 100644
--- a/src/com/p4square/grow/backend/db/CassandraProviderImpl.java
+++ b/src/main/java/com/p4square/grow/backend/db/CassandraProviderImpl.java
diff --git a/src/com/p4square/grow/backend/db/CassandraTrainingRecordProvider.java b/src/main/java/com/p4square/grow/backend/db/CassandraTrainingRecordProvider.java
index 4face52..4face52 100644
--- a/src/com/p4square/grow/backend/db/CassandraTrainingRecordProvider.java
+++ b/src/main/java/com/p4square/grow/backend/db/CassandraTrainingRecordProvider.java
diff --git a/src/com/p4square/grow/backend/dynamo/DbTool.java b/src/main/java/com/p4square/grow/backend/dynamo/DbTool.java
index 374fa83..374fa83 100644
--- a/src/com/p4square/grow/backend/dynamo/DbTool.java
+++ b/src/main/java/com/p4square/grow/backend/dynamo/DbTool.java
diff --git a/src/com/p4square/grow/backend/dynamo/DynamoCollectionProviderImpl.java b/src/main/java/com/p4square/grow/backend/dynamo/DynamoCollectionProviderImpl.java
index b53e9f7..b53e9f7 100644
--- a/src/com/p4square/grow/backend/dynamo/DynamoCollectionProviderImpl.java
+++ b/src/main/java/com/p4square/grow/backend/dynamo/DynamoCollectionProviderImpl.java
diff --git a/src/com/p4square/grow/backend/dynamo/DynamoDatabase.java b/src/main/java/com/p4square/grow/backend/dynamo/DynamoDatabase.java
index 68a165d..68a165d 100644
--- a/src/com/p4square/grow/backend/dynamo/DynamoDatabase.java
+++ b/src/main/java/com/p4square/grow/backend/dynamo/DynamoDatabase.java
diff --git a/src/com/p4square/grow/backend/dynamo/DynamoKey.java b/src/main/java/com/p4square/grow/backend/dynamo/DynamoKey.java
index 5cdbacd..5cdbacd 100644
--- a/src/com/p4square/grow/backend/dynamo/DynamoKey.java
+++ b/src/main/java/com/p4square/grow/backend/dynamo/DynamoKey.java
diff --git a/src/com/p4square/grow/backend/dynamo/DynamoProviderImpl.java b/src/main/java/com/p4square/grow/backend/dynamo/DynamoProviderImpl.java
index 93a535f..93a535f 100644
--- a/src/com/p4square/grow/backend/dynamo/DynamoProviderImpl.java
+++ b/src/main/java/com/p4square/grow/backend/dynamo/DynamoProviderImpl.java
diff --git a/src/com/p4square/grow/backend/feed/FeedDataProvider.java b/src/main/java/com/p4square/grow/backend/feed/FeedDataProvider.java
index 6f090c0..6f090c0 100644
--- a/src/com/p4square/grow/backend/feed/FeedDataProvider.java
+++ b/src/main/java/com/p4square/grow/backend/feed/FeedDataProvider.java
diff --git a/src/com/p4square/grow/backend/feed/ThreadResource.java b/src/main/java/com/p4square/grow/backend/feed/ThreadResource.java
index e8f46c2..e8f46c2 100644
--- a/src/com/p4square/grow/backend/feed/ThreadResource.java
+++ b/src/main/java/com/p4square/grow/backend/feed/ThreadResource.java
diff --git a/src/com/p4square/grow/backend/feed/TopicResource.java b/src/main/java/com/p4square/grow/backend/feed/TopicResource.java
index 24b6a92..24b6a92 100644
--- a/src/com/p4square/grow/backend/feed/TopicResource.java
+++ b/src/main/java/com/p4square/grow/backend/feed/TopicResource.java
diff --git a/src/com/p4square/grow/backend/resources/AccountResource.java b/src/main/java/com/p4square/grow/backend/resources/AccountResource.java
index 2ac7061..2ac7061 100644
--- a/src/com/p4square/grow/backend/resources/AccountResource.java
+++ b/src/main/java/com/p4square/grow/backend/resources/AccountResource.java
diff --git a/src/com/p4square/grow/backend/resources/BannerResource.java b/src/main/java/com/p4square/grow/backend/resources/BannerResource.java
index 2b9c8e6..2b9c8e6 100644
--- a/src/com/p4square/grow/backend/resources/BannerResource.java
+++ b/src/main/java/com/p4square/grow/backend/resources/BannerResource.java
diff --git a/src/com/p4square/grow/backend/resources/SurveyResource.java b/src/main/java/com/p4square/grow/backend/resources/SurveyResource.java
index 8723ee2..8723ee2 100644
--- a/src/com/p4square/grow/backend/resources/SurveyResource.java
+++ b/src/main/java/com/p4square/grow/backend/resources/SurveyResource.java
diff --git a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java b/src/main/java/com/p4square/grow/backend/resources/SurveyResultsResource.java
index 7c15cfd..7c15cfd 100644
--- a/src/com/p4square/grow/backend/resources/SurveyResultsResource.java
+++ b/src/main/java/com/p4square/grow/backend/resources/SurveyResultsResource.java
diff --git a/src/com/p4square/grow/backend/resources/TrainingRecordResource.java b/src/main/java/com/p4square/grow/backend/resources/TrainingRecordResource.java
index 51ba56a..51ba56a 100644
--- a/src/com/p4square/grow/backend/resources/TrainingRecordResource.java
+++ b/src/main/java/com/p4square/grow/backend/resources/TrainingRecordResource.java
diff --git a/src/com/p4square/grow/backend/resources/TrainingResource.java b/src/main/java/com/p4square/grow/backend/resources/TrainingResource.java
index 6efdfab..6efdfab 100644
--- a/src/com/p4square/grow/backend/resources/TrainingResource.java
+++ b/src/main/java/com/p4square/grow/backend/resources/TrainingResource.java
diff --git a/src/com/p4square/grow/ccb/CCBProgressReporter.java b/src/main/java/com/p4square/grow/ccb/CCBProgressReporter.java
index d2826eb..d2826eb 100644
--- a/src/com/p4square/grow/ccb/CCBProgressReporter.java
+++ b/src/main/java/com/p4square/grow/ccb/CCBProgressReporter.java
diff --git a/src/com/p4square/grow/ccb/CCBUser.java b/src/main/java/com/p4square/grow/ccb/CCBUser.java
index 7313172..7313172 100644
--- a/src/com/p4square/grow/ccb/CCBUser.java
+++ b/src/main/java/com/p4square/grow/ccb/CCBUser.java
diff --git a/src/com/p4square/grow/ccb/CCBUserVerifier.java b/src/main/java/com/p4square/grow/ccb/CCBUserVerifier.java
index db10b75..db10b75 100644
--- a/src/com/p4square/grow/ccb/CCBUserVerifier.java
+++ b/src/main/java/com/p4square/grow/ccb/CCBUserVerifier.java
diff --git a/src/com/p4square/grow/ccb/ChurchCommunityBuilderIntegrationDriver.java b/src/main/java/com/p4square/grow/ccb/ChurchCommunityBuilderIntegrationDriver.java
index fc6148f..fc6148f 100644
--- a/src/com/p4square/grow/ccb/ChurchCommunityBuilderIntegrationDriver.java
+++ b/src/main/java/com/p4square/grow/ccb/ChurchCommunityBuilderIntegrationDriver.java
diff --git a/src/com/p4square/grow/ccb/CustomFieldCache.java b/src/main/java/com/p4square/grow/ccb/CustomFieldCache.java
index d93e6d9..d93e6d9 100644
--- a/src/com/p4square/grow/ccb/CustomFieldCache.java
+++ b/src/main/java/com/p4square/grow/ccb/CustomFieldCache.java
diff --git a/src/com/p4square/grow/ccb/MonitoredCCBAPI.java b/src/main/java/com/p4square/grow/ccb/MonitoredCCBAPI.java
index 43b6433..43b6433 100644
--- a/src/com/p4square/grow/ccb/MonitoredCCBAPI.java
+++ b/src/main/java/com/p4square/grow/ccb/MonitoredCCBAPI.java
diff --git a/src/com/p4square/grow/config/Config.java b/src/main/java/com/p4square/grow/config/Config.java
index 2fc2ea3..2fc2ea3 100644
--- a/src/com/p4square/grow/config/Config.java
+++ b/src/main/java/com/p4square/grow/config/Config.java
diff --git a/src/com/p4square/grow/frontend/AccountRedirectResource.java b/src/main/java/com/p4square/grow/frontend/AccountRedirectResource.java
index be2ae65..be2ae65 100644
--- a/src/com/p4square/grow/frontend/AccountRedirectResource.java
+++ b/src/main/java/com/p4square/grow/frontend/AccountRedirectResource.java
diff --git a/src/com/p4square/grow/frontend/AssessmentResetPage.java b/src/main/java/com/p4square/grow/frontend/AssessmentResetPage.java
index 519b135..519b135 100644
--- a/src/com/p4square/grow/frontend/AssessmentResetPage.java
+++ b/src/main/java/com/p4square/grow/frontend/AssessmentResetPage.java
diff --git a/src/com/p4square/grow/frontend/AssessmentResultsPage.java b/src/main/java/com/p4square/grow/frontend/AssessmentResultsPage.java
index f1c924b..f1c924b 100644
--- a/src/com/p4square/grow/frontend/AssessmentResultsPage.java
+++ b/src/main/java/com/p4square/grow/frontend/AssessmentResultsPage.java
diff --git a/src/com/p4square/grow/frontend/AuthenticatedResource.java b/src/main/java/com/p4square/grow/frontend/AuthenticatedResource.java
index 800eb83..800eb83 100644
--- a/src/com/p4square/grow/frontend/AuthenticatedResource.java
+++ b/src/main/java/com/p4square/grow/frontend/AuthenticatedResource.java
diff --git a/src/com/p4square/grow/frontend/ChapterCompletePage.java b/src/main/java/com/p4square/grow/frontend/ChapterCompletePage.java
index 35abc43..35abc43 100644
--- a/src/com/p4square/grow/frontend/ChapterCompletePage.java
+++ b/src/main/java/com/p4square/grow/frontend/ChapterCompletePage.java
diff --git a/src/com/p4square/grow/frontend/ErrorPage.java b/src/main/java/com/p4square/grow/frontend/ErrorPage.java
index 81abe74..81abe74 100644
--- a/src/com/p4square/grow/frontend/ErrorPage.java
+++ b/src/main/java/com/p4square/grow/frontend/ErrorPage.java
diff --git a/src/com/p4square/grow/frontend/FeedData.java b/src/main/java/com/p4square/grow/frontend/FeedData.java
index feb03a1..feb03a1 100644
--- a/src/com/p4square/grow/frontend/FeedData.java
+++ b/src/main/java/com/p4square/grow/frontend/FeedData.java
diff --git a/src/com/p4square/grow/frontend/FeedResource.java b/src/main/java/com/p4square/grow/frontend/FeedResource.java
index 13d0fa0..13d0fa0 100644
--- a/src/com/p4square/grow/frontend/FeedResource.java
+++ b/src/main/java/com/p4square/grow/frontend/FeedResource.java
diff --git a/src/com/p4square/grow/frontend/GroupLeaderTrainingPageResource.java b/src/main/java/com/p4square/grow/frontend/GroupLeaderTrainingPageResource.java
index 3ab140e..3ab140e 100644
--- a/src/com/p4square/grow/frontend/GroupLeaderTrainingPageResource.java
+++ b/src/main/java/com/p4square/grow/frontend/GroupLeaderTrainingPageResource.java
diff --git a/src/com/p4square/grow/frontend/GrowFrontend.java b/src/main/java/com/p4square/grow/frontend/GrowFrontend.java
index b5f62fb..b5f62fb 100644
--- a/src/com/p4square/grow/frontend/GrowFrontend.java
+++ b/src/main/java/com/p4square/grow/frontend/GrowFrontend.java
diff --git a/src/com/p4square/grow/frontend/IntegrationDriver.java b/src/main/java/com/p4square/grow/frontend/IntegrationDriver.java
index b9c3508..b9c3508 100644
--- a/src/com/p4square/grow/frontend/IntegrationDriver.java
+++ b/src/main/java/com/p4square/grow/frontend/IntegrationDriver.java
diff --git a/src/com/p4square/grow/frontend/JsonRequestProvider.java b/src/main/java/com/p4square/grow/frontend/JsonRequestProvider.java
index bf3b2b3..bf3b2b3 100644
--- a/src/com/p4square/grow/frontend/JsonRequestProvider.java
+++ b/src/main/java/com/p4square/grow/frontend/JsonRequestProvider.java
diff --git a/src/com/p4square/grow/frontend/LoginFormAuthenticator.java b/src/main/java/com/p4square/grow/frontend/LoginFormAuthenticator.java
index 21c9097..21c9097 100644
--- a/src/com/p4square/grow/frontend/LoginFormAuthenticator.java
+++ b/src/main/java/com/p4square/grow/frontend/LoginFormAuthenticator.java
diff --git a/src/com/p4square/grow/frontend/LoginPageResource.java b/src/main/java/com/p4square/grow/frontend/LoginPageResource.java
index 38eba07..38eba07 100644
--- a/src/com/p4square/grow/frontend/LoginPageResource.java
+++ b/src/main/java/com/p4square/grow/frontend/LoginPageResource.java
diff --git a/src/com/p4square/grow/frontend/LogoutResource.java b/src/main/java/com/p4square/grow/frontend/LogoutResource.java
index e26dcb7..e26dcb7 100644
--- a/src/com/p4square/grow/frontend/LogoutResource.java
+++ b/src/main/java/com/p4square/grow/frontend/LogoutResource.java
diff --git a/src/com/p4square/grow/frontend/NewAccountResource.java b/src/main/java/com/p4square/grow/frontend/NewAccountResource.java
index 5c13017..5c13017 100644
--- a/src/com/p4square/grow/frontend/NewAccountResource.java
+++ b/src/main/java/com/p4square/grow/frontend/NewAccountResource.java
diff --git a/src/com/p4square/grow/frontend/NewBelieverResource.java b/src/main/java/com/p4square/grow/frontend/NewBelieverResource.java
index 8fe078a..8fe078a 100644
--- a/src/com/p4square/grow/frontend/NewBelieverResource.java
+++ b/src/main/java/com/p4square/grow/frontend/NewBelieverResource.java
diff --git a/src/com/p4square/grow/frontend/NotFoundException.java b/src/main/java/com/p4square/grow/frontend/NotFoundException.java
index dfa2a4c..dfa2a4c 100644
--- a/src/com/p4square/grow/frontend/NotFoundException.java
+++ b/src/main/java/com/p4square/grow/frontend/NotFoundException.java
diff --git a/src/com/p4square/grow/frontend/ProgressReporter.java b/src/main/java/com/p4square/grow/frontend/ProgressReporter.java
index 2f36832..2f36832 100644
--- a/src/com/p4square/grow/frontend/ProgressReporter.java
+++ b/src/main/java/com/p4square/grow/frontend/ProgressReporter.java
diff --git a/src/com/p4square/grow/frontend/SurveyPageResource.java b/src/main/java/com/p4square/grow/frontend/SurveyPageResource.java
index 3575fe3..3575fe3 100644
--- a/src/com/p4square/grow/frontend/SurveyPageResource.java
+++ b/src/main/java/com/p4square/grow/frontend/SurveyPageResource.java
diff --git a/src/com/p4square/grow/frontend/TrainingPageResource.java b/src/main/java/com/p4square/grow/frontend/TrainingPageResource.java
index a1e7789..a1e7789 100644
--- a/src/com/p4square/grow/frontend/TrainingPageResource.java
+++ b/src/main/java/com/p4square/grow/frontend/TrainingPageResource.java
diff --git a/src/com/p4square/grow/frontend/VideosResource.java b/src/main/java/com/p4square/grow/frontend/VideosResource.java
index 2099a77..2099a77 100644
--- a/src/com/p4square/grow/frontend/VideosResource.java
+++ b/src/main/java/com/p4square/grow/frontend/VideosResource.java
diff --git a/src/com/p4square/grow/model/Answer.java b/src/main/java/com/p4square/grow/model/Answer.java
index a818365..a818365 100644
--- a/src/com/p4square/grow/model/Answer.java
+++ b/src/main/java/com/p4square/grow/model/Answer.java
diff --git a/src/com/p4square/grow/model/Banner.java b/src/main/java/com/p4square/grow/model/Banner.java
index b786b36..b786b36 100644
--- a/src/com/p4square/grow/model/Banner.java
+++ b/src/main/java/com/p4square/grow/model/Banner.java
diff --git a/src/com/p4square/grow/model/Chapter.java b/src/main/java/com/p4square/grow/model/Chapter.java
index 3a08e4c..3a08e4c 100644
--- a/src/com/p4square/grow/model/Chapter.java
+++ b/src/main/java/com/p4square/grow/model/Chapter.java
diff --git a/src/com/p4square/grow/model/CircleQuestion.java b/src/main/java/com/p4square/grow/model/CircleQuestion.java
index 71acc14..71acc14 100644
--- a/src/com/p4square/grow/model/CircleQuestion.java
+++ b/src/main/java/com/p4square/grow/model/CircleQuestion.java
diff --git a/src/com/p4square/grow/model/ImageQuestion.java b/src/main/java/com/p4square/grow/model/ImageQuestion.java
index d94c32c..d94c32c 100644
--- a/src/com/p4square/grow/model/ImageQuestion.java
+++ b/src/main/java/com/p4square/grow/model/ImageQuestion.java
diff --git a/src/com/p4square/grow/model/Message.java b/src/main/java/com/p4square/grow/model/Message.java
index 9d33320..9d33320 100644
--- a/src/com/p4square/grow/model/Message.java
+++ b/src/main/java/com/p4square/grow/model/Message.java
diff --git a/src/com/p4square/grow/model/MessageThread.java b/src/main/java/com/p4square/grow/model/MessageThread.java
index 9542a18..9542a18 100644
--- a/src/com/p4square/grow/model/MessageThread.java
+++ b/src/main/java/com/p4square/grow/model/MessageThread.java
diff --git a/src/com/p4square/grow/model/Playlist.java b/src/main/java/com/p4square/grow/model/Playlist.java
index 3e77ada..3e77ada 100644
--- a/src/com/p4square/grow/model/Playlist.java
+++ b/src/main/java/com/p4square/grow/model/Playlist.java
diff --git a/src/com/p4square/grow/model/Point.java b/src/main/java/com/p4square/grow/model/Point.java
index e9fc0ca..e9fc0ca 100644
--- a/src/com/p4square/grow/model/Point.java
+++ b/src/main/java/com/p4square/grow/model/Point.java
diff --git a/src/com/p4square/grow/model/QuadQuestion.java b/src/main/java/com/p4square/grow/model/QuadQuestion.java
index a7b4179..a7b4179 100644
--- a/src/com/p4square/grow/model/QuadQuestion.java
+++ b/src/main/java/com/p4square/grow/model/QuadQuestion.java
diff --git a/src/com/p4square/grow/model/QuadScoringEngine.java b/src/main/java/com/p4square/grow/model/QuadScoringEngine.java
index 33403b5..33403b5 100644
--- a/src/com/p4square/grow/model/QuadScoringEngine.java
+++ b/src/main/java/com/p4square/grow/model/QuadScoringEngine.java
diff --git a/src/com/p4square/grow/model/Question.java b/src/main/java/com/p4square/grow/model/Question.java
index f4b9458..f4b9458 100644
--- a/src/com/p4square/grow/model/Question.java
+++ b/src/main/java/com/p4square/grow/model/Question.java
diff --git a/src/com/p4square/grow/model/RecordedAnswer.java b/src/main/java/com/p4square/grow/model/RecordedAnswer.java
index 7d9905d..7d9905d 100644
--- a/src/com/p4square/grow/model/RecordedAnswer.java
+++ b/src/main/java/com/p4square/grow/model/RecordedAnswer.java
diff --git a/src/com/p4square/grow/model/Score.java b/src/main/java/com/p4square/grow/model/Score.java
index 031c309..031c309 100644
--- a/src/com/p4square/grow/model/Score.java
+++ b/src/main/java/com/p4square/grow/model/Score.java
diff --git a/src/com/p4square/grow/model/ScoringEngine.java b/src/main/java/com/p4square/grow/model/ScoringEngine.java
index 8ff18b3..8ff18b3 100644
--- a/src/com/p4square/grow/model/ScoringEngine.java
+++ b/src/main/java/com/p4square/grow/model/ScoringEngine.java
diff --git a/src/com/p4square/grow/model/SimpleScoringEngine.java b/src/main/java/com/p4square/grow/model/SimpleScoringEngine.java
index 6ef2dbb..6ef2dbb 100644
--- a/src/com/p4square/grow/model/SimpleScoringEngine.java
+++ b/src/main/java/com/p4square/grow/model/SimpleScoringEngine.java
diff --git a/src/com/p4square/grow/model/SliderQuestion.java b/src/main/java/com/p4square/grow/model/SliderQuestion.java
index f0861e3..f0861e3 100644
--- a/src/com/p4square/grow/model/SliderQuestion.java
+++ b/src/main/java/com/p4square/grow/model/SliderQuestion.java
diff --git a/src/com/p4square/grow/model/SliderScoringEngine.java b/src/main/java/com/p4square/grow/model/SliderScoringEngine.java
index 2961e95..2961e95 100644
--- a/src/com/p4square/grow/model/SliderScoringEngine.java
+++ b/src/main/java/com/p4square/grow/model/SliderScoringEngine.java
diff --git a/src/com/p4square/grow/model/TextQuestion.java b/src/main/java/com/p4square/grow/model/TextQuestion.java
index 88c2a34..88c2a34 100644
--- a/src/com/p4square/grow/model/TextQuestion.java
+++ b/src/main/java/com/p4square/grow/model/TextQuestion.java
diff --git a/src/com/p4square/grow/model/TrainingRecord.java b/src/main/java/com/p4square/grow/model/TrainingRecord.java
index bc3ffa9..bc3ffa9 100644
--- a/src/com/p4square/grow/model/TrainingRecord.java
+++ b/src/main/java/com/p4square/grow/model/TrainingRecord.java
diff --git a/src/com/p4square/grow/model/UserRecord.java b/src/main/java/com/p4square/grow/model/UserRecord.java
index 4399282..4399282 100644
--- a/src/com/p4square/grow/model/UserRecord.java
+++ b/src/main/java/com/p4square/grow/model/UserRecord.java
diff --git a/src/com/p4square/grow/model/VideoRecord.java b/src/main/java/com/p4square/grow/model/VideoRecord.java
index ec99d0d..ec99d0d 100644
--- a/src/com/p4square/grow/model/VideoRecord.java
+++ b/src/main/java/com/p4square/grow/model/VideoRecord.java
diff --git a/src/com/p4square/grow/provider/CollectionProvider.java b/src/main/java/com/p4square/grow/provider/CollectionProvider.java
index e4e9040..e4e9040 100644
--- a/src/com/p4square/grow/provider/CollectionProvider.java
+++ b/src/main/java/com/p4square/grow/provider/CollectionProvider.java
diff --git a/src/com/p4square/grow/provider/DelegateCollectionProvider.java b/src/main/java/com/p4square/grow/provider/DelegateCollectionProvider.java
index cf697ba..cf697ba 100644
--- a/src/com/p4square/grow/provider/DelegateCollectionProvider.java
+++ b/src/main/java/com/p4square/grow/provider/DelegateCollectionProvider.java
diff --git a/src/com/p4square/grow/provider/DelegateProvider.java b/src/main/java/com/p4square/grow/provider/DelegateProvider.java
index 42dcc63..42dcc63 100644
--- a/src/com/p4square/grow/provider/DelegateProvider.java
+++ b/src/main/java/com/p4square/grow/provider/DelegateProvider.java
diff --git a/src/com/p4square/grow/provider/JsonEncodedProvider.java b/src/main/java/com/p4square/grow/provider/JsonEncodedProvider.java
index 500f761..500f761 100644
--- a/src/com/p4square/grow/provider/JsonEncodedProvider.java
+++ b/src/main/java/com/p4square/grow/provider/JsonEncodedProvider.java
diff --git a/src/com/p4square/grow/provider/MapCollectionProvider.java b/src/main/java/com/p4square/grow/provider/MapCollectionProvider.java
index 4c5cef6..4c5cef6 100644
--- a/src/com/p4square/grow/provider/MapCollectionProvider.java
+++ b/src/main/java/com/p4square/grow/provider/MapCollectionProvider.java
diff --git a/src/com/p4square/grow/provider/MapProvider.java b/src/main/java/com/p4square/grow/provider/MapProvider.java
index 40f8107..40f8107 100644
--- a/src/com/p4square/grow/provider/MapProvider.java
+++ b/src/main/java/com/p4square/grow/provider/MapProvider.java
diff --git a/src/com/p4square/grow/provider/Provider.java b/src/main/java/com/p4square/grow/provider/Provider.java
index ca6af25..ca6af25 100644
--- a/src/com/p4square/grow/provider/Provider.java
+++ b/src/main/java/com/p4square/grow/provider/Provider.java
diff --git a/src/com/p4square/grow/provider/ProvidesAssessments.java b/src/main/java/com/p4square/grow/provider/ProvidesAssessments.java
index 62ba8f6..62ba8f6 100644
--- a/src/com/p4square/grow/provider/ProvidesAssessments.java
+++ b/src/main/java/com/p4square/grow/provider/ProvidesAssessments.java
diff --git a/src/com/p4square/grow/provider/ProvidesQuestions.java b/src/main/java/com/p4square/grow/provider/ProvidesQuestions.java
index b43f649..b43f649 100644
--- a/src/com/p4square/grow/provider/ProvidesQuestions.java
+++ b/src/main/java/com/p4square/grow/provider/ProvidesQuestions.java
diff --git a/src/com/p4square/grow/provider/ProvidesStrings.java b/src/main/java/com/p4square/grow/provider/ProvidesStrings.java
index 5d9976e..5d9976e 100644
--- a/src/com/p4square/grow/provider/ProvidesStrings.java
+++ b/src/main/java/com/p4square/grow/provider/ProvidesStrings.java
diff --git a/src/com/p4square/grow/provider/ProvidesTrainingRecords.java b/src/main/java/com/p4square/grow/provider/ProvidesTrainingRecords.java
index 586e649..586e649 100644
--- a/src/com/p4square/grow/provider/ProvidesTrainingRecords.java
+++ b/src/main/java/com/p4square/grow/provider/ProvidesTrainingRecords.java
diff --git a/src/com/p4square/grow/provider/ProvidesUserRecords.java b/src/main/java/com/p4square/grow/provider/ProvidesUserRecords.java
index d77c878..d77c878 100644
--- a/src/com/p4square/grow/provider/ProvidesUserRecords.java
+++ b/src/main/java/com/p4square/grow/provider/ProvidesUserRecords.java
diff --git a/src/com/p4square/grow/provider/ProvidesVideos.java b/src/main/java/com/p4square/grow/provider/ProvidesVideos.java
index 3d055d3..3d055d3 100644
--- a/src/com/p4square/grow/provider/ProvidesVideos.java
+++ b/src/main/java/com/p4square/grow/provider/ProvidesVideos.java
diff --git a/src/com/p4square/grow/provider/TrainingRecordProvider.java b/src/main/java/com/p4square/grow/provider/TrainingRecordProvider.java
index 44dba87..44dba87 100644
--- a/src/com/p4square/grow/provider/TrainingRecordProvider.java
+++ b/src/main/java/com/p4square/grow/provider/TrainingRecordProvider.java
diff --git a/src/com/p4square/grow/tools/AssessmentStats.java b/src/main/java/com/p4square/grow/tools/AssessmentStats.java
index ca83411..ca83411 100644
--- a/src/com/p4square/grow/tools/AssessmentStats.java
+++ b/src/main/java/com/p4square/grow/tools/AssessmentStats.java
diff --git a/src/com/p4square/grow/tools/AttributeBackfillTool.java b/src/main/java/com/p4square/grow/tools/AttributeBackfillTool.java
index d7fd2ff..d7fd2ff 100644
--- a/src/com/p4square/grow/tools/AttributeBackfillTool.java
+++ b/src/main/java/com/p4square/grow/tools/AttributeBackfillTool.java
diff --git a/src/com/p4square/grow/tools/AttributeTool.java b/src/main/java/com/p4square/grow/tools/AttributeTool.java
index 8e0540a..8e0540a 100644
--- a/src/com/p4square/grow/tools/AttributeTool.java
+++ b/src/main/java/com/p4square/grow/tools/AttributeTool.java
diff --git a/src/com/p4square/restlet/metrics/MetricRouter.java b/src/main/java/com/p4square/restlet/metrics/MetricRouter.java
index d4da270..d4da270 100644
--- a/src/com/p4square/restlet/metrics/MetricRouter.java
+++ b/src/main/java/com/p4square/restlet/metrics/MetricRouter.java
diff --git a/src/com/p4square/restlet/metrics/MetricsApplication.java b/src/main/java/com/p4square/restlet/metrics/MetricsApplication.java
index 6caf742..6caf742 100644
--- a/src/com/p4square/restlet/metrics/MetricsApplication.java
+++ b/src/main/java/com/p4square/restlet/metrics/MetricsApplication.java
diff --git a/src/com/p4square/restlet/metrics/MetricsResource.java b/src/main/java/com/p4square/restlet/metrics/MetricsResource.java
index e2ab14d..e2ab14d 100644
--- a/src/com/p4square/restlet/metrics/MetricsResource.java
+++ b/src/main/java/com/p4square/restlet/metrics/MetricsResource.java
diff --git a/src/com/p4square/restlet/oauth/OAuthAuthenticator.java b/src/main/java/com/p4square/restlet/oauth/OAuthAuthenticator.java
index c33bb5a..c33bb5a 100644
--- a/src/com/p4square/restlet/oauth/OAuthAuthenticator.java
+++ b/src/main/java/com/p4square/restlet/oauth/OAuthAuthenticator.java
diff --git a/src/com/p4square/restlet/oauth/OAuthAuthenticatorHelper.java b/src/main/java/com/p4square/restlet/oauth/OAuthAuthenticatorHelper.java
index 76ff044..76ff044 100644
--- a/src/com/p4square/restlet/oauth/OAuthAuthenticatorHelper.java
+++ b/src/main/java/com/p4square/restlet/oauth/OAuthAuthenticatorHelper.java
diff --git a/src/com/p4square/restlet/oauth/OAuthException.java b/src/main/java/com/p4square/restlet/oauth/OAuthException.java
index dd326d3..dd326d3 100644
--- a/src/com/p4square/restlet/oauth/OAuthException.java
+++ b/src/main/java/com/p4square/restlet/oauth/OAuthException.java
diff --git a/src/com/p4square/restlet/oauth/OAuthHelper.java b/src/main/java/com/p4square/restlet/oauth/OAuthHelper.java
index 67dd238..67dd238 100644
--- a/src/com/p4square/restlet/oauth/OAuthHelper.java
+++ b/src/main/java/com/p4square/restlet/oauth/OAuthHelper.java
diff --git a/src/com/p4square/restlet/oauth/OAuthUser.java b/src/main/java/com/p4square/restlet/oauth/OAuthUser.java
index 11dbac1..11dbac1 100644
--- a/src/com/p4square/restlet/oauth/OAuthUser.java
+++ b/src/main/java/com/p4square/restlet/oauth/OAuthUser.java
diff --git a/src/com/p4square/restlet/oauth/Token.java b/src/main/java/com/p4square/restlet/oauth/Token.java
index 51a9087..51a9087 100644
--- a/src/com/p4square/restlet/oauth/Token.java
+++ b/src/main/java/com/p4square/restlet/oauth/Token.java
diff --git a/src/com/p4square/session/Session.java b/src/main/java/com/p4square/session/Session.java
index 1bb65f5..1bb65f5 100644
--- a/src/com/p4square/session/Session.java
+++ b/src/main/java/com/p4square/session/Session.java
diff --git a/src/com/p4square/session/SessionAuthenticator.java b/src/main/java/com/p4square/session/SessionAuthenticator.java
index 794e1a8..794e1a8 100644
--- a/src/com/p4square/session/SessionAuthenticator.java
+++ b/src/main/java/com/p4square/session/SessionAuthenticator.java
diff --git a/src/com/p4square/session/SessionCheckingAuthenticator.java b/src/main/java/com/p4square/session/SessionCheckingAuthenticator.java
index 489d6a0..489d6a0 100644
--- a/src/com/p4square/session/SessionCheckingAuthenticator.java
+++ b/src/main/java/com/p4square/session/SessionCheckingAuthenticator.java
diff --git a/src/com/p4square/session/SessionCookieAuthenticator.java b/src/main/java/com/p4square/session/SessionCookieAuthenticator.java
index 0074b77..0074b77 100644
--- a/src/com/p4square/session/SessionCookieAuthenticator.java
+++ b/src/main/java/com/p4square/session/SessionCookieAuthenticator.java
diff --git a/src/com/p4square/session/SessionCreatingAuthenticator.java b/src/main/java/com/p4square/session/SessionCreatingAuthenticator.java
index 3ec14b4..3ec14b4 100644
--- a/src/com/p4square/session/SessionCreatingAuthenticator.java
+++ b/src/main/java/com/p4square/session/SessionCreatingAuthenticator.java
diff --git a/src/com/p4square/session/Sessions.java b/src/main/java/com/p4square/session/Sessions.java
index 9f9dda0..9f9dda0 100644
--- a/src/com/p4square/session/Sessions.java
+++ b/src/main/java/com/p4square/session/Sessions.java
diff --git a/src/com/p4square/grow/backend/apiinfo.html b/src/main/resources/com/p4square/grow/backend/apiinfo.html
index a3637c9..a3637c9 100644
--- a/src/com/p4square/grow/backend/apiinfo.html
+++ b/src/main/resources/com/p4square/grow/backend/apiinfo.html
diff --git a/src/grow.properties b/src/main/resources/grow.properties
index 53075fe..53075fe 100644
--- a/src/grow.properties
+++ b/src/main/resources/grow.properties
diff --git a/src/jetty-logging.properties b/src/main/resources/jetty-logging.properties
index c291cb8..c291cb8 100644
--- a/src/jetty-logging.properties
+++ b/src/main/resources/jetty-logging.properties
diff --git a/src/log4j.properties b/src/main/resources/log4j.properties
index c1e2ecb..c1e2ecb 100644
--- a/src/log4j.properties
+++ b/src/main/resources/log4j.properties
diff --git a/src/templates/macros/common-page.ftl b/src/main/resources/templates/macros/common-page.ftl
index 1780036..1780036 100644
--- a/src/templates/macros/common-page.ftl
+++ b/src/main/resources/templates/macros/common-page.ftl
diff --git a/src/templates/macros/common.ftl b/src/main/resources/templates/macros/common.ftl
index d388a4e..d388a4e 100644
--- a/src/templates/macros/common.ftl
+++ b/src/main/resources/templates/macros/common.ftl
diff --git a/src/templates/macros/content.ftl b/src/main/resources/templates/macros/content.ftl
index eaf0b17..eaf0b17 100644
--- a/src/templates/macros/content.ftl
+++ b/src/main/resources/templates/macros/content.ftl
diff --git a/src/templates/macros/hms.ftl b/src/main/resources/templates/macros/hms.ftl
index 339b8a9..339b8a9 100644
--- a/src/templates/macros/hms.ftl
+++ b/src/main/resources/templates/macros/hms.ftl
diff --git a/src/templates/macros/noticebox.ftl b/src/main/resources/templates/macros/noticebox.ftl
index 34ef994..34ef994 100644
--- a/src/templates/macros/noticebox.ftl
+++ b/src/main/resources/templates/macros/noticebox.ftl
diff --git a/src/templates/pages/assessment.html.ftl b/src/main/resources/templates/pages/assessment.html.ftl
index 3737dc6..3737dc6 100644
--- a/src/templates/pages/assessment.html.ftl
+++ b/src/main/resources/templates/pages/assessment.html.ftl
diff --git a/src/templates/pages/contact.html.ftl b/src/main/resources/templates/pages/contact.html.ftl
index c84e047..c84e047 100644
--- a/src/templates/pages/contact.html.ftl
+++ b/src/main/resources/templates/pages/contact.html.ftl
diff --git a/src/templates/pages/deeper/believer.html.ftl b/src/main/resources/templates/pages/deeper/believer.html.ftl
index 2bf9150..2bf9150 100644
--- a/src/templates/pages/deeper/believer.html.ftl
+++ b/src/main/resources/templates/pages/deeper/believer.html.ftl
diff --git a/src/templates/pages/deeper/disciple.html.ftl b/src/main/resources/templates/pages/deeper/disciple.html.ftl
index dd7fc13..dd7fc13 100644
--- a/src/templates/pages/deeper/disciple.html.ftl
+++ b/src/main/resources/templates/pages/deeper/disciple.html.ftl
diff --git a/src/templates/pages/deeper/leader.html.ftl b/src/main/resources/templates/pages/deeper/leader.html.ftl
index 371c367..371c367 100644
--- a/src/templates/pages/deeper/leader.html.ftl
+++ b/src/main/resources/templates/pages/deeper/leader.html.ftl
diff --git a/src/templates/pages/deeper/seeker.html.ftl b/src/main/resources/templates/pages/deeper/seeker.html.ftl
index ed0b21a..ed0b21a 100644
--- a/src/templates/pages/deeper/seeker.html.ftl
+++ b/src/main/resources/templates/pages/deeper/seeker.html.ftl
diff --git a/src/templates/pages/deeper/teacher.html.ftl b/src/main/resources/templates/pages/deeper/teacher.html.ftl
index f0046f2..f0046f2 100644
--- a/src/templates/pages/deeper/teacher.html.ftl
+++ b/src/main/resources/templates/pages/deeper/teacher.html.ftl
diff --git a/src/templates/pages/index.html.ftl b/src/main/resources/templates/pages/index.html.ftl
index 59a5e38..59a5e38 100644
--- a/src/templates/pages/index.html.ftl
+++ b/src/main/resources/templates/pages/index.html.ftl
diff --git a/src/templates/pages/learnmore.html.ftl b/src/main/resources/templates/pages/learnmore.html.ftl
index f69b075..f69b075 100644
--- a/src/templates/pages/learnmore.html.ftl
+++ b/src/main/resources/templates/pages/learnmore.html.ftl
diff --git a/src/templates/pages/login.html.ftl b/src/main/resources/templates/pages/login.html.ftl
index b88ea74..b88ea74 100644
--- a/src/templates/pages/login.html.ftl
+++ b/src/main/resources/templates/pages/login.html.ftl
diff --git a/src/templates/pages/newaccount.html.ftl b/src/main/resources/templates/pages/newaccount.html.ftl
index edfd196..edfd196 100644
--- a/src/templates/pages/newaccount.html.ftl
+++ b/src/main/resources/templates/pages/newaccount.html.ftl
diff --git a/src/templates/pages/verification.html.ftl b/src/main/resources/templates/pages/verification.html.ftl
index e81b005..e81b005 100644
--- a/src/templates/pages/verification.html.ftl
+++ b/src/main/resources/templates/pages/verification.html.ftl
diff --git a/src/templates/pages/version.ftl b/src/main/resources/templates/pages/version.ftl
index d8a38a2..d8a38a2 100644
--- a/src/templates/pages/version.ftl
+++ b/src/main/resources/templates/pages/version.ftl
diff --git a/src/templates/templates/assessment-results.ftl b/src/main/resources/templates/templates/assessment-results.ftl
index 12c45b7..12c45b7 100644
--- a/src/templates/templates/assessment-results.ftl
+++ b/src/main/resources/templates/templates/assessment-results.ftl
diff --git a/src/templates/templates/banner.ftl b/src/main/resources/templates/templates/banner.ftl
index 3a2d23b..3a2d23b 100644
--- a/src/templates/templates/banner.ftl
+++ b/src/main/resources/templates/templates/banner.ftl
diff --git a/src/templates/templates/communityfeed.ftl b/src/main/resources/templates/templates/communityfeed.ftl
index 71b33bc..71b33bc 100644
--- a/src/templates/templates/communityfeed.ftl
+++ b/src/main/resources/templates/templates/communityfeed.ftl
diff --git a/src/templates/templates/deeperheader.ftl b/src/main/resources/templates/templates/deeperheader.ftl
index 32fa9bf..32fa9bf 100644
--- a/src/templates/templates/deeperheader.ftl
+++ b/src/main/resources/templates/templates/deeperheader.ftl
diff --git a/src/templates/templates/error.ftl b/src/main/resources/templates/templates/error.ftl
index 4f46839..4f46839 100644
--- a/src/templates/templates/error.ftl
+++ b/src/main/resources/templates/templates/error.ftl
diff --git a/src/templates/templates/footer.ftl b/src/main/resources/templates/templates/footer.ftl
index 8ea05fe..e6bae13 100644
--- a/src/templates/templates/footer.ftl
+++ b/src/main/resources/templates/templates/footer.ftl
@@ -8,7 +8,7 @@
     <div class="right">
         &copy;2013 <a href="http://myfoursquarechurch.com">Foursquare Church</a>
         <#if config.getDomain() != "prod">
-        - <#include "/templates/gitversion.ftl">
+        - <#include "/templates/gitversion.ftl" parse=false>
         </#if>
     </div>
 
diff --git a/src/templates/templates/getstarted-button.ftl b/src/main/resources/templates/templates/getstarted-button.ftl
index b0baaee..b0baaee 100644
--- a/src/templates/templates/getstarted-button.ftl
+++ b/src/main/resources/templates/templates/getstarted-button.ftl
diff --git a/src/main/resources/templates/templates/gitversion.ftl b/src/main/resources/templates/templates/gitversion.ftl
new file mode 100644
index 0000000..08e5207
--- /dev/null
+++ b/src/main/resources/templates/templates/gitversion.ftl
@@ -0,0 +1 @@
+${describe}
diff --git a/src/templates/templates/header.ftl b/src/main/resources/templates/templates/header.ftl
index 0911bbc..0911bbc 100644
--- a/src/templates/templates/header.ftl
+++ b/src/main/resources/templates/templates/header.ftl
diff --git a/src/templates/templates/index-hero.ftl b/src/main/resources/templates/templates/index-hero.ftl
index 023475a..023475a 100644
--- a/src/templates/templates/index-hero.ftl
+++ b/src/main/resources/templates/templates/index-hero.ftl
diff --git a/src/templates/templates/nav.ftl b/src/main/resources/templates/templates/nav.ftl
index c1f22ae..c1f22ae 100644
--- a/src/templates/templates/nav.ftl
+++ b/src/main/resources/templates/templates/nav.ftl
diff --git a/src/templates/templates/newbeliever.ftl b/src/main/resources/templates/templates/newbeliever.ftl
index 226b054..226b054 100644
--- a/src/templates/templates/newbeliever.ftl
+++ b/src/main/resources/templates/templates/newbeliever.ftl
diff --git a/src/templates/templates/question-circle.ftl b/src/main/resources/templates/templates/question-circle.ftl
index fbb2e61..fbb2e61 100644
--- a/src/templates/templates/question-circle.ftl
+++ b/src/main/resources/templates/templates/question-circle.ftl
diff --git a/src/templates/templates/question-image.ftl b/src/main/resources/templates/templates/question-image.ftl
index 280c4aa..280c4aa 100644
--- a/src/templates/templates/question-image.ftl
+++ b/src/main/resources/templates/templates/question-image.ftl
diff --git a/src/templates/templates/question-quad.ftl b/src/main/resources/templates/templates/question-quad.ftl
index f84dcff..f84dcff 100644
--- a/src/templates/templates/question-quad.ftl
+++ b/src/main/resources/templates/templates/question-quad.ftl
diff --git a/src/templates/templates/question-slider.ftl b/src/main/resources/templates/templates/question-slider.ftl
index 08b6bd0..08b6bd0 100644
--- a/src/templates/templates/question-slider.ftl
+++ b/src/main/resources/templates/templates/question-slider.ftl
diff --git a/src/templates/templates/question-text.ftl b/src/main/resources/templates/templates/question-text.ftl
index ac5b846..ac5b846 100644
--- a/src/templates/templates/question-text.ftl
+++ b/src/main/resources/templates/templates/question-text.ftl
diff --git a/src/templates/templates/stage-complete.ftl b/src/main/resources/templates/templates/stage-complete.ftl
index 72dc780..72dc780 100644
--- a/src/templates/templates/stage-complete.ftl
+++ b/src/main/resources/templates/templates/stage-complete.ftl
diff --git a/src/templates/templates/stage-teacher-forward.ftl b/src/main/resources/templates/templates/stage-teacher-forward.ftl
index e8f186d..e8f186d 100644
--- a/src/templates/templates/stage-teacher-forward.ftl
+++ b/src/main/resources/templates/templates/stage-teacher-forward.ftl
diff --git a/src/templates/templates/survey.ftl b/src/main/resources/templates/templates/survey.ftl
index d770461..d770461 100644
--- a/src/templates/templates/survey.ftl
+++ b/src/main/resources/templates/templates/survey.ftl
diff --git a/src/templates/templates/training.ftl b/src/main/resources/templates/templates/training.ftl
index c5d1b32..c5d1b32 100644
--- a/src/templates/templates/training.ftl
+++ b/src/main/resources/templates/templates/training.ftl
diff --git a/src/templates/utils/dump.ftl b/src/main/resources/templates/utils/dump.ftl
index 6491a25..6491a25 100644
--- a/src/templates/utils/dump.ftl
+++ b/src/main/resources/templates/utils/dump.ftl
diff --git a/web/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 4b85bde..4b85bde 100644
--- a/web/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
diff --git a/web/error.html b/src/main/webapp/error.html
index b01128b..b01128b 100644
--- a/web/error.html
+++ b/src/main/webapp/error.html
diff --git a/web/favicon.ico b/src/main/webapp/favicon.ico
index 200f311..200f311 100644
--- a/web/favicon.ico
+++ b/src/main/webapp/favicon.ico
diff --git a/web/images/02-a1-hover.jpg b/src/main/webapp/images/02-a1-hover.jpg
index 8101265..8101265 100644
--- a/web/images/02-a1-hover.jpg
+++ b/src/main/webapp/images/02-a1-hover.jpg
diff --git a/web/images/02-a1.jpg b/src/main/webapp/images/02-a1.jpg
index d87ea14..d87ea14 100644
--- a/web/images/02-a1.jpg
+++ b/src/main/webapp/images/02-a1.jpg
diff --git a/web/images/02-a2-hover.jpg b/src/main/webapp/images/02-a2-hover.jpg
index 40c1bd7..40c1bd7 100644
--- a/web/images/02-a2-hover.jpg
+++ b/src/main/webapp/images/02-a2-hover.jpg
diff --git a/web/images/02-a2.jpg b/src/main/webapp/images/02-a2.jpg
index e03669c..e03669c 100644
--- a/web/images/02-a2.jpg
+++ b/src/main/webapp/images/02-a2.jpg
diff --git a/web/images/02-a3-hover.jpg b/src/main/webapp/images/02-a3-hover.jpg
index fc2bb44..fc2bb44 100644
--- a/web/images/02-a3-hover.jpg
+++ b/src/main/webapp/images/02-a3-hover.jpg
diff --git a/web/images/02-a3.jpg b/src/main/webapp/images/02-a3.jpg
index 1991fb1..1991fb1 100644
--- a/web/images/02-a3.jpg
+++ b/src/main/webapp/images/02-a3.jpg
diff --git a/web/images/02-a4-hover.jpg b/src/main/webapp/images/02-a4-hover.jpg
index 9f08263..9f08263 100644
--- a/web/images/02-a4-hover.jpg
+++ b/src/main/webapp/images/02-a4-hover.jpg
diff --git a/web/images/02-a4.jpg b/src/main/webapp/images/02-a4.jpg
index 742f60e..742f60e 100644
--- a/web/images/02-a4.jpg
+++ b/src/main/webapp/images/02-a4.jpg
diff --git a/web/images/02-a5-hover.jpg b/src/main/webapp/images/02-a5-hover.jpg
index 8cd1f9d..8cd1f9d 100644
--- a/web/images/02-a5-hover.jpg
+++ b/src/main/webapp/images/02-a5-hover.jpg
diff --git a/web/images/02-a5.jpg b/src/main/webapp/images/02-a5.jpg
index 465c199..465c199 100644
--- a/web/images/02-a5.jpg
+++ b/src/main/webapp/images/02-a5.jpg
diff --git a/web/images/02-a6-hover.jpg b/src/main/webapp/images/02-a6-hover.jpg
index 1fe87bd..1fe87bd 100644
--- a/web/images/02-a6-hover.jpg
+++ b/src/main/webapp/images/02-a6-hover.jpg
diff --git a/web/images/02-a6.jpg b/src/main/webapp/images/02-a6.jpg
index df26868..df26868 100644
--- a/web/images/02-a6.jpg
+++ b/src/main/webapp/images/02-a6.jpg
diff --git a/web/images/08-a1-hover.jpg b/src/main/webapp/images/08-a1-hover.jpg
index cfa7077..cfa7077 100644
--- a/web/images/08-a1-hover.jpg
+++ b/src/main/webapp/images/08-a1-hover.jpg
diff --git a/web/images/08-a1.jpg b/src/main/webapp/images/08-a1.jpg
index e249a3c..e249a3c 100644
--- a/web/images/08-a1.jpg
+++ b/src/main/webapp/images/08-a1.jpg
diff --git a/web/images/08-a2-hover.jpg b/src/main/webapp/images/08-a2-hover.jpg
index 77af9cc..77af9cc 100644
--- a/web/images/08-a2-hover.jpg
+++ b/src/main/webapp/images/08-a2-hover.jpg
diff --git a/web/images/08-a2.jpg b/src/main/webapp/images/08-a2.jpg
index 287353d..287353d 100644
--- a/web/images/08-a2.jpg
+++ b/src/main/webapp/images/08-a2.jpg
diff --git a/web/images/08-a3-hover.jpg b/src/main/webapp/images/08-a3-hover.jpg
index 6d3b50c..6d3b50c 100644
--- a/web/images/08-a3-hover.jpg
+++ b/src/main/webapp/images/08-a3-hover.jpg
diff --git a/web/images/08-a3.jpg b/src/main/webapp/images/08-a3.jpg
index eab7d7a..eab7d7a 100644
--- a/web/images/08-a3.jpg
+++ b/src/main/webapp/images/08-a3.jpg
diff --git a/web/images/about-grow.png b/src/main/webapp/images/about-grow.png
index c95a018..c95a018 100644
--- a/web/images/about-grow.png
+++ b/src/main/webapp/images/about-grow.png
diff --git a/web/images/acts242.png b/src/main/webapp/images/acts242.png
index 358f3f7..358f3f7 100644
--- a/web/images/acts242.png
+++ b/src/main/webapp/images/acts242.png
diff --git a/web/images/close.png b/src/main/webapp/images/close.png
index 8854d89..8854d89 100644
--- a/web/images/close.png
+++ b/src/main/webapp/images/close.png
diff --git a/web/images/complete.png b/src/main/webapp/images/complete.png
index 780be45..780be45 100644
--- a/web/images/complete.png
+++ b/src/main/webapp/images/complete.png
diff --git a/web/images/faux_right_column.png b/src/main/webapp/images/faux_right_column.png
index d87e901..d87e901 100644
--- a/web/images/faux_right_column.png
+++ b/src/main/webapp/images/faux_right_column.png
diff --git a/web/images/foursquarechurchlogin.png b/src/main/webapp/images/foursquarechurchlogin.png
index 0d5f861..0d5f861 100644
--- a/web/images/foursquarechurchlogin.png
+++ b/src/main/webapp/images/foursquarechurchlogin.png
diff --git a/web/images/foursquarelg.png b/src/main/webapp/images/foursquarelg.png
index bb01365..bb01365 100644
--- a/web/images/foursquarelg.png
+++ b/src/main/webapp/images/foursquarelg.png
diff --git a/web/images/foursquaresm.png b/src/main/webapp/images/foursquaresm.png
index 263e0d9..263e0d9 100644
--- a/web/images/foursquaresm.png
+++ b/src/main/webapp/images/foursquaresm.png
diff --git a/web/images/grow-poster.png b/src/main/webapp/images/grow-poster.png
index 35e6e45..35e6e45 100644
--- a/web/images/grow-poster.png
+++ b/src/main/webapp/images/grow-poster.png
diff --git a/web/images/hero.png b/src/main/webapp/images/hero.png
index 6077e96..6077e96 100644
--- a/web/images/hero.png
+++ b/src/main/webapp/images/hero.png
diff --git a/web/images/leadershipdev.png b/src/main/webapp/images/leadershipdev.png
index d08a29a..d08a29a 100644
--- a/web/images/leadershipdev.png
+++ b/src/main/webapp/images/leadershipdev.png
diff --git a/web/images/loginbg.png b/src/main/webapp/images/loginbg.png
index 79a791f..79a791f 100644
--- a/web/images/loginbg.png
+++ b/src/main/webapp/images/loginbg.png
diff --git a/web/images/logo.png b/src/main/webapp/images/logo.png
index b18dd7d..b18dd7d 100644
--- a/web/images/logo.png
+++ b/src/main/webapp/images/logo.png
diff --git a/web/images/next.png b/src/main/webapp/images/next.png
index 4449a8d..4449a8d 100644
--- a/web/images/next.png
+++ b/src/main/webapp/images/next.png
diff --git a/web/images/noticeicon.png b/src/main/webapp/images/noticeicon.png
index 578fb5e..578fb5e 100644
--- a/web/images/noticeicon.png
+++ b/src/main/webapp/images/noticeicon.png
diff --git a/web/images/play.png b/src/main/webapp/images/play.png
index bd17dfc..bd17dfc 100644
--- a/web/images/play.png
+++ b/src/main/webapp/images/play.png
diff --git a/web/images/previous.png b/src/main/webapp/images/previous.png
index 7e5eef6..7e5eef6 100644
--- a/web/images/previous.png
+++ b/src/main/webapp/images/previous.png
diff --git a/web/images/quad.png b/src/main/webapp/images/quad.png
index 9cd3e74..9cd3e74 100644
--- a/web/images/quad.png
+++ b/src/main/webapp/images/quad.png
diff --git a/web/images/quadselector.png b/src/main/webapp/images/quadselector.png
index a730adb..a730adb 100644
--- a/web/images/quadselector.png
+++ b/src/main/webapp/images/quadselector.png
diff --git a/web/images/reply.png b/src/main/webapp/images/reply.png
index ffcebe8..ffcebe8 100644
--- a/web/images/reply.png
+++ b/src/main/webapp/images/reply.png
diff --git a/web/images/slider.png b/src/main/webapp/images/slider.png
index acc98dc..acc98dc 100644
--- a/web/images/slider.png
+++ b/src/main/webapp/images/slider.png
diff --git a/web/images/videoimage.jpg b/src/main/webapp/images/videoimage.jpg
index 23e8053..23e8053 100644
--- a/web/images/videoimage.jpg
+++ b/src/main/webapp/images/videoimage.jpg
diff --git a/web/notfound.html b/src/main/webapp/notfound.html
index 29e6493..29e6493 100644
--- a/web/notfound.html
+++ b/src/main/webapp/notfound.html
diff --git a/web/scripts/growth.js b/src/main/webapp/scripts/growth.js
index 9ae6786..9ae6786 100644
--- a/web/scripts/growth.js
+++ b/src/main/webapp/scripts/growth.js
diff --git a/web/scripts/jquery-ui.js b/src/main/webapp/scripts/jquery-ui.js
index df25d36..df25d36 100644
--- a/web/scripts/jquery-ui.js
+++ b/src/main/webapp/scripts/jquery-ui.js
diff --git a/web/scripts/jquery.min.js b/src/main/webapp/scripts/jquery.min.js
index 006e953..006e953 100644
--- a/web/scripts/jquery.min.js
+++ b/src/main/webapp/scripts/jquery.min.js
diff --git a/web/style.css b/src/main/webapp/style.css
index 4562f1a..4562f1a 100644
--- a/web/style.css
+++ b/src/main/webapp/style.css
diff --git a/src/templates/templates/gitversion.ftl b/src/templates/templates/gitversion.ftl
deleted file mode 100644
index 09e2f95..0000000
--- a/src/templates/templates/gitversion.ftl
+++ /dev/null
@@ -1 +0,0 @@
-@repository.version@
diff --git a/tst/com/p4square/grow/backend/resources/ResourceTestBase.java b/src/test/java/com/p4square/grow/backend/resources/ResourceTestBase.java
index b4d7864..b4d7864 100644
--- a/tst/com/p4square/grow/backend/resources/ResourceTestBase.java
+++ b/src/test/java/com/p4square/grow/backend/resources/ResourceTestBase.java
diff --git a/tst/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java b/src/test/java/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java
index db85051..db85051 100644
--- a/tst/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java
+++ b/src/test/java/com/p4square/grow/backend/resources/TrainingRecordResourceTest.java
diff --git a/tst/com/p4square/grow/ccb/CCBProgressReporterTest.java b/src/test/java/com/p4square/grow/ccb/CCBProgressReporterTest.java
index 63a973a..63a973a 100644
--- a/tst/com/p4square/grow/ccb/CCBProgressReporterTest.java
+++ b/src/test/java/com/p4square/grow/ccb/CCBProgressReporterTest.java
diff --git a/tst/com/p4square/grow/ccb/CCBUserVerifierTest.java b/src/test/java/com/p4square/grow/ccb/CCBUserVerifierTest.java
index d17b698..d17b698 100644
--- a/tst/com/p4square/grow/ccb/CCBUserVerifierTest.java
+++ b/src/test/java/com/p4square/grow/ccb/CCBUserVerifierTest.java
diff --git a/tst/com/p4square/grow/ccb/CustomFieldCacheTest.java b/src/test/java/com/p4square/grow/ccb/CustomFieldCacheTest.java
index bcfd260..bcfd260 100644
--- a/tst/com/p4square/grow/ccb/CustomFieldCacheTest.java
+++ b/src/test/java/com/p4square/grow/ccb/CustomFieldCacheTest.java
diff --git a/tst/com/p4square/grow/config/ConfigTest.java b/src/test/java/com/p4square/grow/config/ConfigTest.java
index ccb39da..ccb39da 100644
--- a/tst/com/p4square/grow/config/ConfigTest.java
+++ b/src/test/java/com/p4square/grow/config/ConfigTest.java
diff --git a/tst/com/p4square/grow/model/AnswerTest.java b/src/test/java/com/p4square/grow/model/AnswerTest.java
index 1747773..1747773 100644
--- a/tst/com/p4square/grow/model/AnswerTest.java
+++ b/src/test/java/com/p4square/grow/model/AnswerTest.java
diff --git a/tst/com/p4square/grow/model/CircleQuestionTest.java b/src/test/java/com/p4square/grow/model/CircleQuestionTest.java
index 222cda5..222cda5 100644
--- a/tst/com/p4square/grow/model/CircleQuestionTest.java
+++ b/src/test/java/com/p4square/grow/model/CircleQuestionTest.java
diff --git a/tst/com/p4square/grow/model/ImageQuestionTest.java b/src/test/java/com/p4square/grow/model/ImageQuestionTest.java
index 28ccdb2..28ccdb2 100644
--- a/tst/com/p4square/grow/model/ImageQuestionTest.java
+++ b/src/test/java/com/p4square/grow/model/ImageQuestionTest.java
diff --git a/tst/com/p4square/grow/model/PlaylistTest.java b/src/test/java/com/p4square/grow/model/PlaylistTest.java
index 9c893f6..9c893f6 100644
--- a/tst/com/p4square/grow/model/PlaylistTest.java
+++ b/src/test/java/com/p4square/grow/model/PlaylistTest.java
diff --git a/tst/com/p4square/grow/model/PointTest.java b/src/test/java/com/p4square/grow/model/PointTest.java
index a4e7cc0..a4e7cc0 100644
--- a/tst/com/p4square/grow/model/PointTest.java
+++ b/src/test/java/com/p4square/grow/model/PointTest.java
diff --git a/tst/com/p4square/grow/model/QuadQuestionTest.java b/src/test/java/com/p4square/grow/model/QuadQuestionTest.java
index 389148a..389148a 100644
--- a/tst/com/p4square/grow/model/QuadQuestionTest.java
+++ b/src/test/java/com/p4square/grow/model/QuadQuestionTest.java
diff --git a/tst/com/p4square/grow/model/QuadScoringEngineTest.java b/src/test/java/com/p4square/grow/model/QuadScoringEngineTest.java
index 246a59f..246a59f 100644
--- a/tst/com/p4square/grow/model/QuadScoringEngineTest.java
+++ b/src/test/java/com/p4square/grow/model/QuadScoringEngineTest.java
diff --git a/tst/com/p4square/grow/model/QuestionTest.java b/src/test/java/com/p4square/grow/model/QuestionTest.java
index d09d2d8..d09d2d8 100644
--- a/tst/com/p4square/grow/model/QuestionTest.java
+++ b/src/test/java/com/p4square/grow/model/QuestionTest.java
diff --git a/tst/com/p4square/grow/model/ScoreTest.java b/src/test/java/com/p4square/grow/model/ScoreTest.java
index 5c7be46..5c7be46 100644
--- a/tst/com/p4square/grow/model/ScoreTest.java
+++ b/src/test/java/com/p4square/grow/model/ScoreTest.java
diff --git a/tst/com/p4square/grow/model/SimpleScoringEngineTest.java b/src/test/java/com/p4square/grow/model/SimpleScoringEngineTest.java
index 1a1bc95..1a1bc95 100644
--- a/tst/com/p4square/grow/model/SimpleScoringEngineTest.java
+++ b/src/test/java/com/p4square/grow/model/SimpleScoringEngineTest.java
diff --git a/tst/com/p4square/grow/model/SliderQuestionTest.java b/src/test/java/com/p4square/grow/model/SliderQuestionTest.java
index b5c4e83..b5c4e83 100644
--- a/tst/com/p4square/grow/model/SliderQuestionTest.java
+++ b/src/test/java/com/p4square/grow/model/SliderQuestionTest.java
diff --git a/tst/com/p4square/grow/model/SliderScoringEngineTest.java b/src/test/java/com/p4square/grow/model/SliderScoringEngineTest.java
index 1ea0d4c..1ea0d4c 100644
--- a/tst/com/p4square/grow/model/SliderScoringEngineTest.java
+++ b/src/test/java/com/p4square/grow/model/SliderScoringEngineTest.java
diff --git a/tst/com/p4square/grow/model/TextQuestionTest.java b/src/test/java/com/p4square/grow/model/TextQuestionTest.java
index d85ed86..d85ed86 100644
--- a/tst/com/p4square/grow/model/TextQuestionTest.java
+++ b/src/test/java/com/p4square/grow/model/TextQuestionTest.java
diff --git a/tst/com/p4square/grow/model/TrainingRecordTest.java b/src/test/java/com/p4square/grow/model/TrainingRecordTest.java
index 43caa90..43caa90 100644
--- a/tst/com/p4square/grow/model/TrainingRecordTest.java
+++ b/src/test/java/com/p4square/grow/model/TrainingRecordTest.java
diff --git a/tst/com/p4square/grow/config/ConfigTest.properties b/src/test/resources/com/p4square/grow/config/ConfigTest.properties
index e5b4032..e5b4032 100644
--- a/tst/com/p4square/grow/config/ConfigTest.properties
+++ b/src/test/resources/com/p4square/grow/config/ConfigTest.properties
diff --git a/tst/com/p4square/grow/model/trainingrecord.json b/src/test/resources/com/p4square/grow/model/trainingrecord.json
index ea214f3..ea214f3 100644
--- a/tst/com/p4square/grow/model/trainingrecord.json
+++ b/src/test/resources/com/p4square/grow/model/trainingrecord.json