diff -r 1b94e6e9579f -r 9c70d81e9062 client/gulpfile.js
--- a/client/gulpfile.js	Thu Oct 09 11:48:42 2014 +0200
+++ b/client/gulpfile.js	Thu Oct 09 12:17:28 2014 +0200
@@ -8,9 +8,13 @@
 //var filesize = require('gulp-filesize');
 //var cssmin  = require('gulp-cssmin');
 
+var templateFolder = '../annot-server/templates/';
+var templateFileDest = '../annot-server/templates/annotationclient.html';
+var staticFolder = '../annot-server/static';
+
 gulp.task('clean', function () {
-  return gulp.src('build', {read: false})
-    .pipe(clean());
+  gulp.src(templateFileDest, {read: false}).pipe(clean());
+  gulp.src(staticFolder, {read: false}).pipe(clean());
 });
 
 var scriptsSrc = ['!./app/**/*_test.js','./app/**/*.js'];
@@ -22,33 +26,34 @@
         .pipe(plugins.jshint.reporter('default'))
         .pipe(plugins.jshint.reporter('fail'))
         .pipe(plugins.concat('app.js'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/js'))
         .pipe(plugins.filesize())
         .pipe(plugins.uglify())
         .pipe(plugins.rename('app.min.js'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/js'))
         .pipe(plugins.filesize())
         .on('error', gutil.log);
 });
 
-gulp.task('templates',function(){
-    //combine all template files of the app into a js file
-    gulp.src(['!./app/index.html',
-        './app/**/*.html'])
-        .pipe(plugins.angularTemplatecache('templates.js',{standalone:true}))
-        .pipe(gulp.dest('./build'));
-});
+
+//gulp.task('templates',function(){
+//    //combine all template files of the app into a js file
+//    gulp.src(['!./app/index.html',
+//        './app/**/*.html'])
+//        .pipe(plugins.angularTemplatecache('templates.js',{standalone:true}))
+//        .pipe(gulp.dest(staticFolder+'/js'));
+//});
 
 gulp.task('css', function(){
     gulp.src('./app/**/*.css')
 //        .pipe(plugins.csslint())
 //        .pipe(plugins.csslint.reporter())
         .pipe(plugins.concat('app.css'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/css'))
         .pipe(plugins.filesize())
         .pipe(plugins.minifyCss({keepBreaks:true}))
         .pipe(plugins.rename('app.min.css'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/css'))
         .pipe(plugins.filesize());
 });
 
@@ -67,11 +72,11 @@
     //concatenate vendor JS files
     gulp.src(vendorJSsrc)
         .pipe(plugins.concat('lib.js'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/js'))
         .pipe(plugins.filesize())
         .pipe(plugins.uglify())
         .pipe(plugins.rename('lib.min.js'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/js'))
         .pipe(plugins.filesize())
         .on('error', gutil.log);
 });
@@ -81,48 +86,48 @@
     gulp.src(['!./bower_components/**/*.min.css',
         './bower_components/**/*.css'])
         .pipe(plugins.concat('lib.css'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/css'))
         .pipe(plugins.filesize())
         .pipe(plugins.minifyCss({keepBreaks:true}))
         .pipe(plugins.rename('lib.min.css'))
-        .pipe(gulp.dest('./build'))
+        .pipe(gulp.dest(staticFolder+'/css'))
         .pipe(plugins.filesize());
 });
 
 gulp.task('vendorFonts', function(){
     gulp.src(['./bower_components/**/fonts/*'])
         .pipe(plugins.flatten())
-        .pipe(gulp.dest('./build/fonts'));
+        .pipe(gulp.dest(staticFolder+'/css/fonts'));
 });
 
 gulp.task('copy-index', function() {
-    gulp.src('./app/index.html')
-        .pipe(gulp.dest('./build'));
+    gulp.src('./app/annotationclient.html')
+        .pipe(gulp.dest(templateFolder));
 });
 
 gulp.task('copy-data', function() {
     gulp.src('./data/**/*')
-        .pipe(gulp.dest('./build/data'));
+        .pipe(gulp.dest(staticFolder+'/data'));
 });
 
 gulp.task('copy-img', function() {
     gulp.src('./img/**/*')
-        .pipe(gulp.dest('./build/img'));
+        .pipe(gulp.dest(staticFolder+'/img'));
 });
 
 gulp.task('watch',function(){
     gulp.watch([
-        'build/**/*.html',
-        'build/**/*.js',
-        'build/**/*.css'
+        templateFolder+'/**/*.html',
+        staticFolder+'/**/*.js',
+        staticFolder+'/**/*.css'
     ], function(event) {
         return gulp.src(event.path)
             .pipe(plugins.connect.reload());
     });
     gulp.watch(['./app/**/*.js','!./app/**/*test.js'],['scripts']);
-    gulp.watch(['!./app/index.html','./app/**/*.html'],['templates']);
+    //gulp.watch(['!./app/index.html','./app/**/*.html'],['templates']);
     gulp.watch('./app/**/*.css',['css']);
-    gulp.watch('./app/index.html',['copy-index']);
+    gulp.watch('./app/annotationclient.html',['copy-index']);
     gulp.watch('./data/**/*',['copy-data']);
     gulp.watch('./img/**/*',['copy-img']);
 
@@ -134,4 +139,5 @@
     livereload: true
 }));
 
-gulp.task('default',['connect','scripts','templates','css','copy-index','copy-data','copy-img','vendorJS','vendorCSS','vendorFonts','watch']);
+//gulp.task('default',['connect','scripts','templates','css','copy-index','copy-data','copy-img','vendorJS','vendorCSS','vendorFonts','watch']);
+gulp.task('default',['connect','scripts','css','copy-index','copy-data','copy-img','vendorJS','vendorCSS','vendorFonts','watch']);