diff --git a/Jenkinsfile b/Jenkinsfile
index ea3793b..63549a5 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,40 +1,36 @@
+#!groovy
 // Jenkinsfile (Pipeline Script)
+
+mavenConfiguration = [
+        jdk: "jdk7",
+        maven: "m3.5",
+        mavenLocalRepo: ".repository",
+        mavenSettingsConfig: "639c4560-87b7-4502-bb3d-2c44845cd2b5"
+]
+
 node {
-    // Configure environment
-    //env.JAVA_HOME = tool name: 'JDK8'
-    env.REPO_URL = "repo.koc.se/zallery.git"
-    env.BUILD_NAME = "BUILD-" + env.BUILD_ID
-
-
-    checkout scm
-
-    stage('Build') {
-        sh 'ant clean'
-        sh 'ant build'
+    stage('Checkout') {
+        checkout scm
     }
 
-    stage('Package') {
-        sh 'ant package'
-        archiveArtifacts artifacts: 'build/release/*', fingerprint: true
+    withMaven(mavenConfiguration) {
+        def mvnParams = "-Dbuild.number=${BUILD_NUMBER}"
 
-        // Tag artifact
-        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'f8e5f6c6-4adb-4ab2-bb5d-1c8535dff491',
-                                      usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-            sh "git tag ${env.BUILD_NAME}"
-            sh "git push 'https://${USERNAME}:${PASSWORD}@${env.REPO_URL}' ${env.BUILD_NAME}"
+        stage('Build') {
+            sh "mvn ${mvnParams} clean compile"
+        }
+
+        stage('Test') {
+            sh "mvn ${mvnParams} test"
+        }
+
+        stage('Package') {
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests package"
+        }
+
+        stage('Deploy') {
+            sh "mvn ${mvnParams} -DskipStatic -DskipTests deploy"
+            sh "mvn ${mvnParams} scm:tag"
         }
     }
-}
-
-stage('Deploy') {
-    timeout(time:2, unit:'HOURS') {
-        input message: 'Deploy?', submitter: 'ziver'
-    }
-    node {
-        withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: '46f1d99b-2037-47b9-a7b7-57a1066337fc',
-                                      usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD']]) {
-            sh 'ant -Dtomcat.user=${USERNAME} -Dtomcat.pass=${PASSWORD} deploy'
-        }
-    }
-}
-
+}
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
deleted file mode 100755
index 80de9b5..0000000
--- a/WebContent/WEB-INF/web.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-         id="WebApp_ID" version="2.5">
-  <display-name>Zallery</display-name>
- 
-
-  <servlet>
-    <servlet-name>Zallery</servlet-name>
-    <servlet-class>zall.Zallery</servlet-class>
-	<load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Zallery</servlet-name>
-    <url-pattern>/gallery</url-pattern>
-    <url-pattern>/media</url-pattern>
-    <url-pattern>/slideshow</url-pattern>
-    <url-pattern>/login</url-pattern>
-    <url-pattern>/logout</url-pattern>
-    <url-pattern>/upload</url-pattern>
-    <url-pattern>/profile</url-pattern>
-    <url-pattern>/users</url-pattern>
-    <url-pattern>/register</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>Content</servlet-name>
-    <servlet-class>zall.page.ContentServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Content</servlet-name>
-    <url-pattern>/content</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>Ajax</servlet-name>
-    <servlet-class>zall.ZalleryAjax</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Ajax</servlet-name>
-    <url-pattern>/ajax</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-	<servlet-name>Upload</servlet-name>
-	<servlet-class>zall.UploadServlet</servlet-class>
-	<init-param>
-		<param-name>TEMP_PATH</param-name>
-		<param-value>SYSTEM</param-value>
-	</init-param>
-	<init-param>
-		<param-name>ALLOWED_EXTENSIONS</param-name>
-		<param-value>png,jpg,jpeg,gif,tif,bmp,avi,wmv,mov,mp4,mpeg,flv,m4v,divx,xvid</param-value>
-	</init-param>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Upload</servlet-name>
-    <url-pattern>/uploadserv</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>transcoder</servlet-name>
-    <servlet-class>zall.transcoder.ZalleryTranscoder</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <welcome-file-list>
-    <welcome-file>gallery</welcome-file>
-  </welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web_debug.xml b/WebContent/WEB-INF/web_debug.xml
deleted file mode 100644
index 0e3b9e3..0000000
--- a/WebContent/WEB-INF/web_debug.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>Zallery</display-name>
- 
-  <welcome-file-list>
-    <welcome-file>gallery</welcome-file>
-  </welcome-file-list>
-  
-  <servlet>
-    <servlet-name>Zallery</servlet-name>
-    <servlet-class>zall.Zallery</servlet-class>    
-    <init-param>
-		<param-name>WEBSITE_NAME</param-name>
-		<param-value>Koc.se Gallery</param-value>
-	</init-param>
-	<init-param>
-		<param-name>WEBSITE_URL</param-name>
-		<param-value>http://koc.se/Zallery/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>SMTP_HOST</param-name>
-		<param-value>192.168.0.10</param-value>
-	</init-param>
-    <init-param>
-		<param-name>THEME</param-name>
-		<param-value></param-value>
-	</init-param>
-	<init-param>
-		<param-name>DATA_PATH</param-name>
-		<param-value>C:\\Users\\Ziver\\Desktop\\Downloads\\temp\\album</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Zallery</servlet-name>
-    <url-pattern>/gallery</url-pattern>
-    <url-pattern>/media</url-pattern>
-    <url-pattern>/slideshow</url-pattern>
-    <url-pattern>/login</url-pattern>
-    <url-pattern>/logout</url-pattern>
-    <url-pattern>/upload</url-pattern>
-    <url-pattern>/profile</url-pattern>
-    <url-pattern>/users</url-pattern>
-    <url-pattern>/register</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>Content</servlet-name>
-    <servlet-class>zall.page.ContentServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Content</servlet-name>
-    <url-pattern>/content</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>Ajax</servlet-name>
-    <servlet-class>zall.ZalleryAjax</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Ajax</servlet-name>
-    <url-pattern>/ajax</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-	<servlet-name>Upload</servlet-name>
-	<servlet-class>zall.UploadServlet</servlet-class>
-	<init-param>
-		<param-name>TEMP_PATH</param-name>
-		<param-value>C:\\Users\\Ziver\\Desktop\\Downloads\\temp\\</param-value>
-	</init-param>
-	<init-param>
-		<param-name>ALLOWED_EXTENSIONS</param-name>
-		<param-value>png,jpg,jpeg,gif,tif,bmp,avi,wmv,mov,mp4,mpeg,flv,m4v,divx,xvid</param-value>
-	</init-param>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Upload</servlet-name>
-    <url-pattern>/uploadserv</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>transcoder</servlet-name>
-    <servlet-class>zall.ZalleryTranscoder</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <welcome-file-list>
-    <welcome-file>gallery</welcome-file>
-  </welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/web_server.xml b/WebContent/WEB-INF/web_server.xml
deleted file mode 100644
index 12a9fb9..0000000
--- a/WebContent/WEB-INF/web_server.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
-  <display-name>Zallery</display-name>
- 
-  <welcome-file-list>
-    <welcome-file>gallery</welcome-file>
-  </welcome-file-list>
-  
-  <servlet>
-    <servlet-name>Zallery</servlet-name>
-    <servlet-class>zall.Zallery</servlet-class>    
-    <init-param>
-		<param-name>WEBSITE_NAME</param-name>
-		<param-value>Koc.se Gallery</param-value>
-	</init-param>
-	<init-param>
-		<param-name>WEBSITE_URL</param-name>
-		<param-value>http://koc.se/Zallery/</param-value>
-	</init-param>
-	<init-param>
-		<param-name>SMTP_HOST</param-name>
-		<param-value>192.168.0.10</param-value>
-	</init-param>
-    <init-param>
-		<param-name>THEME</param-name>
-		<param-value></param-value>
-	</init-param>
-	<init-param>
-		<param-name>DATA_PATH</param-name>
-		<param-value>/home/tomcat/ZalleryData/</param-value>
-	</init-param>
-	<load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Zallery</servlet-name>
-    <url-pattern>/gallery</url-pattern>
-    <url-pattern>/media</url-pattern>
-    <url-pattern>/slideshow</url-pattern>
-    <url-pattern>/login</url-pattern>
-    <url-pattern>/logout</url-pattern>
-    <url-pattern>/upload</url-pattern>
-    <url-pattern>/profile</url-pattern>
-    <url-pattern>/users</url-pattern>
-    <url-pattern>/register</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>Content</servlet-name>
-    <servlet-class>zall.page.ContentServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Content</servlet-name>
-    <url-pattern>/content</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>Ajax</servlet-name>
-    <servlet-class>zall.ZalleryAjax</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Ajax</servlet-name>
-    <url-pattern>/ajax</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-	<servlet-name>Upload</servlet-name>
-	<servlet-class>zall.UploadServlet</servlet-class>
-	<init-param>
-		<param-name>ALLOWED_EXTENSIONS</param-name>
-		<param-value>png,jpg,jpeg,gif,tif,bmp,avi,wmv,mov,mp4,mpeg,flv,m4v,divx,xvid</param-value>
-	</init-param>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>Upload</servlet-name>
-    <url-pattern>/uploadserv</url-pattern>
-  </servlet-mapping>
-  
-  <servlet>
-    <servlet-name>transcoder</servlet-name>
-    <servlet-class>zall.ZalleryTranscoder</servlet-class>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  
-  <welcome-file-list>
-    <welcome-file>gallery</welcome-file>
-  </welcome-file-list>
-</web-app>
\ No newline at end of file
diff --git a/WebContent/page_gallery.jsp b/WebContent/page_gallery.jsp
index 9206f0f..4b28d1f 100755
--- a/WebContent/page_gallery.jsp
+++ b/WebContent/page_gallery.jsp
@@ -1,4 +1,4 @@
-<jsp:include page="about.jsp"/>
+<jsp:include page="header.jsp"/>
 
 <jsp:include page="navbar.jsp"/>
 
diff --git a/Zallery.iml b/Zallery.iml
index 934e528..775bcac 100755
--- a/Zallery.iml
+++ b/Zallery.iml
@@ -11,7 +11,7 @@
       <src_folder value="file://$MODULE_DIR$/src" expected_position="0" />
     </src_description>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -55,7 +55,7 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="library" name="Maven: se.koc:zutil:1.0.1" level="project" />
+    <orderEntry type="module" module-name="Zutil" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-io:commons-io:2.5" level="project" />
     <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
diff --git a/pom.xml b/pom.xml
index 0b3ba2e..8e138bc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,23 +6,22 @@
 
     <groupId>se.koc</groupId>
     <artifactId>zallery</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.0.${build.number}</version>
     <packaging>war</packaging>
 
     <name>Zallery</name>
 
-
-
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>1.7</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <build.number>SNAPSHOT</build.number>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>se.koc</groupId>
             <artifactId>zutil</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
@@ -71,9 +70,17 @@
                     <warSourceDirectory>WebContent</warSourceDirectory>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <url>http://localhost:8080/manager/text</url>
+                    <server>tomcat</server>
+                </configuration>
+            </plugin>
 
         </plugins>
     </build>
 
-
 </project>