diff --git a/build/compiler.jar b/build/compiler.jar
deleted file mode 100644
index a12f24be3..000000000
Binary files a/build/compiler.jar and /dev/null differ
diff --git a/dev/Common/Booter.jsx b/dev/Common/Booter.jsx
index c821cbdb2..c0530dcec 100644
--- a/dev/Common/Booter.jsx
+++ b/dev/Common/Booter.jsx
@@ -26,6 +26,10 @@ window.__includeScr = (src) => {
 	window.document.write(unescape('%3Csc' + 'ript data-cfasync="false" type="text/jav' + 'ascr' + 'ipt" sr' + 'c="' + src + '"%3E%3C/' + 'scr' + 'ipt%3E'));
 };
 
+window.__includeAppScr = (src) => {
+	window.__includeScr(src + (window.__rlah ? window.__rlah() || '0' : '0') + '/' + window.Math.random().toString().substr(2) + '/');
+};
+
 window.__includeStyle = (styles) => {
 	window.document.write(unescape('%3Csty' + 'le%3E' + styles + '"%3E%3C/' + 'sty' + 'le%3E'));
 };
diff --git a/gulpfile.js b/gulpfile.js
index 700c0c0d0..e5bcb1c76 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -144,14 +144,12 @@ cfg.paths.js = {
 	openpgp: {
 		name: 'openpgp.min.js',
 		src: [
-//			'vendors/openpgp/1.2.0/openpgp.min.js'
 			'vendors/openpgp/2.3.0/openpgp.min.js'
 		]
 	},
 	openpgpworker: {
 		name: 'openpgp.worker.min.js',
 		src: [
-//			'vendors/openpgp/1.2.0/openpgp.worker.min.js'
 			'vendors/openpgp/2.3.0/openpgp.worker.min.js'
 		]
 	},
@@ -228,8 +226,7 @@ gulp.task('less:main', function() {
 		.pipe(rename(cfg.paths.less.main.name))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticCSS))
-		.on('error', gutil.log)
-	;
+		.on('error', gutil.log);
 });
 
 gulp.task('css:main-begin', ['less:main'], function() {
@@ -249,8 +246,7 @@ gulp.task('css:main-begin', ['less:main'], function() {
 //		.pipe(csslint.reporter())
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticCSS))
-		.pipe(livereload())
-	;
+		.pipe(livereload());
 });
 
 gulp.task('package:community-on', function() {
@@ -272,11 +268,9 @@ gulp.task('css:clear-less', ['css:main-begin'], function() {
 gulp.task('css:main', ['css:clear-less']);
 
 gulp.task('css:main:min', ['css:main'], function() {
-	var minifyCss = require('gulp-minify-css');
+	var cleanCSS  = require('gulp-clean-css');
 	return gulp.src(cfg.paths.staticCSS + cfg.paths.css.main.name)
-		.pipe(minifyCss({
-			'keepSpecialComments': 0
-		}))
+		.pipe(cleanCSS())
 		.pipe(rename({suffix: '.min'}))
 		.pipe(eol('\n', true))
 		.pipe(gulp.dest(cfg.paths.staticCSS));
@@ -438,23 +432,12 @@ gulp.task('js:min', ['js:app', 'js:admin', 'js:chunks', 'js:validate'], function
 // lint
 gulp.task('js:lint', function() {
 
-	var
-		closureCompiler = require('gulp-closure-compiler'),
-		jshint = require('gulp-jshint')
-	;
+	var jshint = require('gulp-jshint');
 
 	return gulp.src(cfg.paths.globjsonly)
 		.pipe(jshint('.jshintrc'))
 		.pipe(jshint.reporter('jshint-summary', cfg.summary))
 		.pipe(jshint.reporter('fail'))
-		// google compiler
-		.pipe(gulpif(cfg.googleCompile, closureCompiler({
-			compilerPath: './build/compiler.jar',
-			fileName: 'gc.js',
-			compilerFlags: {
-				output_wrapper: '(function(){%output%}());'
-			}
-		})))
 	;
 });
 
@@ -465,8 +448,7 @@ gulp.task('js:eslint', function() {
 	return gulp.src(cfg.paths.globjsxonly)
 		.pipe(eslint())
 		.pipe(eslint.format())
-		.pipe(eslint.failAfterError())
-	;
+		.pipe(eslint.failAfterError());
 });
 
 gulp.task('js:validate', ['js:lint', 'js:eslint']);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 4e3d373b3..777e921b4 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,12 +1,7 @@
 {
   "name": "RainLoop",
-  "version": "1.9.4",
+  "version": "1.10.0",
   "dependencies": {
-    "Base64": {
-      "version": "0.2.1",
-      "from": "Base64@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
-    },
     "abbrev": {
       "version": "1.0.7",
       "from": "abbrev@>=1.0.0 <2.0.0",
@@ -186,37 +181,6 @@
         }
       }
     },
-    "babel-eslint": {
-      "version": "4.1.8",
-      "from": "babel-eslint@>=4.1.5 <5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.8.tgz",
-      "dependencies": {
-        "babel-core": {
-          "version": "5.8.38",
-          "from": "babel-core@>=5.8.33 <6.0.0",
-          "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz"
-        },
-        "babylon": {
-          "version": "5.8.38",
-          "from": "babylon@>=5.8.38 <6.0.0",
-          "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz"
-        },
-        "globals": {
-          "version": "6.4.1",
-          "from": "globals@>=6.4.0 <7.0.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz"
-        },
-        "js-tokens": {
-          "version": "1.0.1",
-          "from": "js-tokens@1.0.1",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.1.tgz"
-        },
-        "lodash": {
-          "version": "3.10.1",
-          "from": "lodash@>=3.10.0 <4.0.0"
-        }
-      }
-    },
     "babel-generator": {
       "version": "6.7.5",
       "from": "babel-generator@>=6.7.5 <7.0.0",
@@ -412,11 +376,6 @@
         }
       }
     },
-    "babel-loader": {
-      "version": "6.2.4",
-      "from": "babel-loader@>=6.1.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.2.4.tgz"
-    },
     "babel-messages": {
       "version": "6.7.2",
       "from": "babel-messages@>=6.7.2 <7.0.0",
@@ -734,7 +693,8 @@
       "dependencies": {
         "babel-runtime": {
           "version": "5.8.38",
-          "from": "babel-runtime@>=5.0.0 <6.0.0"
+          "from": "babel-runtime@5.8.38",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz"
         }
       }
     },
@@ -841,7 +801,8 @@
       "dependencies": {
         "babel-runtime": {
           "version": "5.8.38",
-          "from": "babel-runtime@>=5.0.0 <6.0.0"
+          "from": "babel-runtime@5.8.38",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz"
         }
       }
     },
@@ -972,18 +933,8 @@
       "dependencies": {
         "babel-runtime": {
           "version": "5.8.38",
-          "from": "babel-runtime@>=5.0.0 <6.0.0"
-        }
-      }
-    },
-    "babel-plugin-transform-runtime": {
-      "version": "6.7.5",
-      "from": "babel-plugin-transform-runtime@>=6.1.18 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.7.5.tgz",
-      "dependencies": {
-        "babel-runtime": {
-          "version": "5.8.38",
-          "from": "babel-runtime@>=5.0.0 <6.0.0"
+          "from": "babel-runtime@5.8.38",
+          "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz"
         }
       }
     },
@@ -1009,21 +960,6 @@
       "from": "babel-plugin-undefined-to-void@>=1.1.6 <2.0.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz"
     },
-    "babel-preset-es2015": {
-      "version": "6.6.0",
-      "from": "babel-preset-es2015@*",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.6.0.tgz"
-    },
-    "babel-preset-es2015-loose": {
-      "version": "7.0.0",
-      "from": "babel-preset-es2015-loose@>=7.0.0 <8.0.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015-loose/-/babel-preset-es2015-loose-7.0.0.tgz"
-    },
-    "babel-preset-stage-0": {
-      "version": "6.5.0",
-      "from": "babel-preset-stage-0@>=6.1.18 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.5.0.tgz"
-    },
     "babel-preset-stage-1": {
       "version": "6.5.0",
       "from": "babel-preset-stage-1@>=6.3.13 <7.0.0",
@@ -1074,9 +1010,9 @@
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.6.1.tgz",
       "dependencies": {
         "core-js": {
-          "version": "2.2.2",
+          "version": "2.3.0",
           "from": "core-js@>=2.1.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.2.2.tgz"
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"
         }
       }
     },
@@ -1148,6 +1084,11 @@
       "from": "balanced-match@>=0.3.0 <0.4.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
     },
+    "Base64": {
+      "version": "0.2.1",
+      "from": "Base64@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+    },
     "base64-js": {
       "version": "0.0.8",
       "from": "base64-js@0.0.8",
@@ -2076,11 +2017,6 @@
       "from": "gonzales-pe@3.0.0-28",
       "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-3.0.0-28.tgz"
     },
-    "google-closure-compiler": {
-      "version": "20151015.7.0",
-      "from": "google-closure-compiler@>=20151015.0.0 <20151016.0.0",
-      "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20151015.7.0.tgz"
-    },
     "graceful-fs": {
       "version": "4.1.3",
       "from": "graceful-fs@>=4.1.2 <5.0.0",
@@ -2096,315 +2032,10 @@
       "from": "growly@>=1.2.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz"
     },
-    "gulp": {
-      "version": "3.9.1",
-      "from": "gulp@>=3.9.0 <3.10.0",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"
-    },
-    "gulp-autoprefixer": {
-      "version": "3.1.0",
-      "from": "gulp-autoprefixer@*",
-      "resolved": "https://registry.npmjs.org/gulp-autoprefixer/-/gulp-autoprefixer-3.1.0.tgz"
-    },
-    "gulp-beautify": {
-      "version": "2.0.0",
-      "from": "gulp-beautify@*",
-      "resolved": "https://registry.npmjs.org/gulp-beautify/-/gulp-beautify-2.0.0.tgz"
-    },
-    "gulp-closure-compiler": {
-      "version": "0.4.0",
-      "from": "gulp-closure-compiler@*",
-      "resolved": "https://registry.npmjs.org/gulp-closure-compiler/-/gulp-closure-compiler-0.4.0.tgz"
-    },
-    "gulp-concat-util": {
-      "version": "0.5.5",
-      "from": "gulp-concat-util@*",
-      "resolved": "https://registry.npmjs.org/gulp-concat-util/-/gulp-concat-util-0.5.5.tgz",
-      "dependencies": {
-        "gulp-if": {
-          "version": "2.0.0",
-          "from": "gulp-if@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-2.0.0.tgz"
-        }
-      }
-    },
-    "gulp-csscomb": {
-      "version": "3.0.7",
-      "from": "gulp-csscomb@*",
-      "resolved": "https://registry.npmjs.org/gulp-csscomb/-/gulp-csscomb-3.0.7.tgz"
-    },
-    "gulp-csslint": {
-      "version": "0.3.0",
-      "from": "gulp-csslint@*",
-      "resolved": "https://registry.npmjs.org/gulp-csslint/-/gulp-csslint-0.3.0.tgz"
-    },
-    "gulp-eol": {
-      "version": "0.1.1",
-      "from": "gulp-eol@*",
-      "resolved": "https://registry.npmjs.org/gulp-eol/-/gulp-eol-0.1.1.tgz",
-      "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "from": "ansi-regex@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz"
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "from": "ansi-styles@>=1.1.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz"
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "from": "chalk@>=0.5.0 <0.6.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz"
-        },
-        "gulp-util": {
-          "version": "2.2.20",
-          "from": "gulp-util@>=2.2.0 <2.3.0",
-          "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-2.2.20.tgz",
-          "dependencies": {
-            "through2": {
-              "version": "0.5.1",
-              "from": "through2@>=0.5.0 <0.6.0",
-              "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
-            }
-          }
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "from": "has-ansi@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-        },
-        "lodash._reinterpolate": {
-          "version": "2.4.1",
-          "from": "lodash._reinterpolate@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-2.4.1.tgz"
-        },
-        "lodash.escape": {
-          "version": "2.4.1",
-          "from": "lodash.escape@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-2.4.1.tgz"
-        },
-        "lodash.keys": {
-          "version": "2.4.1",
-          "from": "lodash.keys@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-2.4.1.tgz"
-        },
-        "lodash.template": {
-          "version": "2.4.1",
-          "from": "lodash.template@>=2.4.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-2.4.1.tgz"
-        },
-        "lodash.templatesettings": {
-          "version": "2.4.1",
-          "from": "lodash.templatesettings@>=2.4.1 <2.5.0",
-          "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-2.4.1.tgz"
-        },
-        "minimist": {
-          "version": "0.2.0",
-          "from": "minimist@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.17 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "from": "strip-ansi@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz"
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "from": "supports-color@>=0.2.0 <0.3.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
-        },
-        "through2": {
-          "version": "0.4.2",
-          "from": "through2@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "dependencies": {
-            "xtend": {
-              "version": "2.1.2",
-              "from": "xtend@>=2.1.1 <2.2.0",
-              "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"
-            }
-          }
-        },
-        "vinyl": {
-          "version": "0.2.3",
-          "from": "vinyl@>=0.2.1 <0.3.0",
-          "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.2.3.tgz"
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "from": "xtend@>=3.0.0 <3.1.0",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-        }
-      }
-    },
-    "gulp-eslint": {
-      "version": "1.1.1",
-      "from": "gulp-eslint@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-1.1.1.tgz"
-    },
-    "gulp-header": {
-      "version": "1.7.1",
-      "from": "gulp-header@*",
-      "resolved": "https://registry.npmjs.org/gulp-header/-/gulp-header-1.7.1.tgz"
-    },
-    "gulp-if": {
-      "version": "1.2.5",
-      "from": "gulp-if@>=1.2.5 <1.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-if/-/gulp-if-1.2.5.tgz",
-      "dependencies": {
-        "gulp-match": {
-          "version": "0.2.1",
-          "from": "gulp-match@>=0.2.1 <0.3.0",
-          "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-0.2.1.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1"
-        },
-        "merge-stream": {
-          "version": "0.1.8",
-          "from": "merge-stream@>=0.1.6 <0.2.0",
-          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
-        },
-        "minimatch": {
-          "version": "1.0.0",
-          "from": "minimatch@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.33-1 <1.1.0-0"
-        },
-        "ternary-stream": {
-          "version": "1.2.3",
-          "from": "ternary-stream@>=1.2.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/ternary-stream/-/ternary-stream-1.2.3.tgz"
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.2 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
-        }
-      }
-    },
-    "gulp-jshint": {
-      "version": "2.0.0",
-      "from": "gulp-jshint@*",
-      "resolved": "https://registry.npmjs.org/gulp-jshint/-/gulp-jshint-2.0.0.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1"
-        },
-        "rcloader": {
-          "version": "0.1.2",
-          "from": "rcloader@0.1.2",
-          "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.1.2.tgz",
-          "dependencies": {
-            "lodash": {
-              "version": "2.4.2",
-              "from": "lodash@>=2.4.1 <2.5.0",
-              "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.33-1 <1.1.0-0"
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
-        }
-      }
-    },
-    "gulp-less": {
-      "version": "1.3.6",
-      "from": "gulp-less@1.3.6",
-      "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-1.3.6.tgz",
-      "dependencies": {
-        "convert-source-map": {
-          "version": "0.4.1",
-          "from": "convert-source-map@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.4.1.tgz"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.17 <1.1.0"
-        },
-        "source-map": {
-          "version": "0.1.43",
-          "from": "source-map@>=0.1.39 <0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"
-        },
-        "through2": {
-          "version": "0.5.1",
-          "from": "through2@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
-        },
-        "vinyl-sourcemaps-apply": {
-          "version": "0.1.4",
-          "from": "vinyl-sourcemaps-apply@>=0.1.1 <0.2.0",
-          "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.1.4.tgz"
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "from": "xtend@>=3.0.0 <3.1.0"
-        }
-      }
-    },
-    "gulp-livereload": {
-      "version": "3.8.1",
-      "from": "gulp-livereload@>=3.8.0 <3.9.0",
-      "resolved": "https://registry.npmjs.org/gulp-livereload/-/gulp-livereload-3.8.1.tgz",
-      "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "from": "ansi-regex@>=0.2.0 <0.3.0"
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "from": "ansi-styles@>=1.1.0 <2.0.0"
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "from": "chalk@>=0.5.1 <0.6.0"
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "from": "has-ansi@>=0.1.0 <0.2.0"
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "from": "strip-ansi@>=0.3.0 <0.4.0"
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "from": "supports-color@>=0.2.0 <0.3.0"
-        }
-      }
-    },
     "gulp-match": {
-      "version": "1.0.1",
-      "from": "gulp-match@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.1.tgz",
+      "version": "1.0.2",
+      "from": "gulp-match@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gulp-match/-/gulp-match-1.0.2.tgz",
       "dependencies": {
         "minimatch": {
           "version": "3.0.0",
@@ -2413,146 +2044,6 @@
         }
       }
     },
-    "gulp-minify-css": {
-      "version": "1.2.4",
-      "from": "gulp-minify-css@*",
-      "resolved": "https://registry.npmjs.org/gulp-minify-css/-/gulp-minify-css-1.2.4.tgz",
-      "dependencies": {
-        "clean-css": {
-          "version": "3.4.12",
-          "from": "clean-css@>=3.3.3 <4.0.0",
-          "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.12.tgz"
-        },
-        "commander": {
-          "version": "2.8.1",
-          "from": "commander@>=2.8.0 <2.9.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "from": "source-map@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
-        }
-      }
-    },
-    "gulp-notify": {
-      "version": "2.2.0",
-      "from": "gulp-notify@>=2.2.0 <2.3.0",
-      "resolved": "https://registry.npmjs.org/gulp-notify/-/gulp-notify-2.2.0.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.33-1 <1.1.0-0"
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.3 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
-        }
-      }
-    },
-    "gulp-plumber": {
-      "version": "1.1.0",
-      "from": "gulp-plumber@*",
-      "resolved": "https://registry.npmjs.org/gulp-plumber/-/gulp-plumber-1.1.0.tgz"
-    },
-    "gulp-rename": {
-      "version": "1.2.2",
-      "from": "gulp-rename@*",
-      "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz"
-    },
-    "gulp-replace": {
-      "version": "0.5.4",
-      "from": "gulp-replace@*",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-0.5.4.tgz"
-    },
-    "gulp-rimraf": {
-      "version": "0.2.0",
-      "from": "gulp-rimraf@*",
-      "resolved": "https://registry.npmjs.org/gulp-rimraf/-/gulp-rimraf-0.2.0.tgz"
-    },
-    "gulp-stripbom": {
-      "version": "1.0.4",
-      "from": "gulp-stripbom@*",
-      "resolved": "https://registry.npmjs.org/gulp-stripbom/-/gulp-stripbom-1.0.4.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.17 <1.1.0"
-        },
-        "strip-bom": {
-          "version": "1.0.0",
-          "from": "strip-bom@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"
-        },
-        "through2": {
-          "version": "0.5.1",
-          "from": "through2@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
-        },
-        "xtend": {
-          "version": "3.0.0",
-          "from": "xtend@>=3.0.0 <3.1.0"
-        }
-      }
-    },
-    "gulp-through": {
-      "version": "0.3.2",
-      "from": "gulp-through@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/gulp-through/-/gulp-through-0.3.2.tgz",
-      "dependencies": {
-        "ansi-regex": {
-          "version": "0.2.1",
-          "from": "ansi-regex@>=0.2.0 <0.3.0"
-        },
-        "ansi-styles": {
-          "version": "1.1.0",
-          "from": "ansi-styles@>=1.1.0 <2.0.0"
-        },
-        "chalk": {
-          "version": "0.5.1",
-          "from": "chalk@>=0.5.1 <0.6.0"
-        },
-        "has-ansi": {
-          "version": "0.1.0",
-          "from": "has-ansi@>=0.1.0 <0.2.0"
-        },
-        "isarray": {
-          "version": "0.0.1",
-          "from": "isarray@0.0.1"
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "from": "readable-stream@>=1.0.33-1 <1.1.0-0"
-        },
-        "strip-ansi": {
-          "version": "0.3.0",
-          "from": "strip-ansi@>=0.3.0 <0.4.0"
-        },
-        "supports-color": {
-          "version": "0.2.0",
-          "from": "supports-color@>=0.2.0 <0.3.0"
-        },
-        "through2": {
-          "version": "0.6.5",
-          "from": "through2@>=0.6.1 <0.7.0",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz"
-        }
-      }
-    },
-    "gulp-uglify": {
-      "version": "1.5.3",
-      "from": "gulp-uglify@*",
-      "resolved": "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-1.5.3.tgz"
-    },
     "gulp-util": {
       "version": "3.0.7",
       "from": "gulp-util@*",
@@ -2565,11 +2056,6 @@
         }
       }
     },
-    "gulp-zip": {
-      "version": "3.2.0",
-      "from": "gulp-zip@*",
-      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-3.2.0.tgz"
-    },
     "gulplog": {
       "version": "1.0.0",
       "from": "gulplog@>=1.0.0 <2.0.0",
@@ -2910,45 +2396,6 @@
       "from": "jsesc@>=0.5.0 <0.6.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
     },
-    "jshint": {
-      "version": "2.9.1",
-      "from": "jshint@latest",
-      "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.1.tgz",
-      "dependencies": {
-        "lodash": {
-          "version": "3.7.0",
-          "from": "lodash@>=3.7.0 <3.8.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz"
-        },
-        "shelljs": {
-          "version": "0.3.0",
-          "from": "shelljs@>=0.3.0 <0.4.0",
-          "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
-        }
-      }
-    },
-    "jshint-summary": {
-      "version": "0.4.0",
-      "from": "jshint-summary@*",
-      "resolved": "https://registry.npmjs.org/jshint-summary/-/jshint-summary-0.4.0.tgz",
-      "dependencies": {
-        "ansi-styles": {
-          "version": "1.0.0",
-          "from": "ansi-styles@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz"
-        },
-        "chalk": {
-          "version": "0.4.0",
-          "from": "chalk@>=0.4.0 <0.5.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz"
-        },
-        "strip-ansi": {
-          "version": "0.1.1",
-          "from": "strip-ansi@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz"
-        }
-      }
-    },
     "json-stable-stringify": {
       "version": "1.0.1",
       "from": "json-stable-stringify@>=1.0.0 <2.0.0",
@@ -3463,11 +2910,6 @@
       "from": "node-emoji@>=0.1.0 <0.2.0",
       "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-0.1.0.tgz"
     },
-    "node-fs": {
-      "version": "0.1.7",
-      "from": "node-fs@*",
-      "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz"
-    },
     "node-libs-browser": {
       "version": "0.5.3",
       "from": "node-libs-browser@>=0.4.0 <=0.6.0",
@@ -4157,16 +3599,16 @@
       "from": "stream-consume@>=0.1.0 <0.2.0",
       "resolved": "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz"
     },
-    "string-width": {
-      "version": "1.0.1",
-      "from": "string-width@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz"
-    },
     "string_decoder": {
       "version": "0.10.31",
       "from": "string_decoder@>=0.10.0 <0.11.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
     },
+    "string-width": {
+      "version": "1.0.1",
+      "from": "string-width@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz"
+    },
     "stringmap": {
       "version": "0.2.2",
       "from": "stringmap@>=0.2.2 <0.3.0",
@@ -4212,11 +3654,6 @@
       "from": "tapable@>=0.1.8 <0.2.0",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
     },
-    "temp-write": {
-      "version": "1.1.2",
-      "from": "temp-write@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/temp-write/-/temp-write-1.1.2.tgz"
-    },
     "ternary-stream": {
       "version": "2.0.0",
       "from": "ternary-stream@>=2.0.0 <3.0.0",
@@ -4393,11 +3830,6 @@
       "from": "util-deprecate@>=1.0.1 <1.1.0",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
     },
-    "uuid": {
-      "version": "2.0.2",
-      "from": "uuid@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"
-    },
     "v8flags": {
       "version": "2.0.11",
       "from": "v8flags@>=2.0.2 <3.0.0",
@@ -4526,27 +3958,6 @@
         }
       }
     },
-    "webpack": {
-      "version": "1.12.15",
-      "from": "webpack@*",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-1.12.15.tgz",
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.2",
-          "from": "esprima@>=2.5.0 <3.0.0"
-        },
-        "interpret": {
-          "version": "0.6.6",
-          "from": "interpret@>=0.6.4 <0.7.0",
-          "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
-        },
-        "supports-color": {
-          "version": "3.1.2",
-          "from": "supports-color@>=3.1.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
-        }
-      }
-    },
     "webpack-core": {
       "version": "0.6.8",
       "from": "webpack-core@>=0.6.0 <0.7.0",
diff --git a/package.json b/package.json
index 7f8521bb1..c16a50366 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "type": "git",
     "url": "git://github.com/RainLoop/rainloop-webmail.git"
   },
+  "license": "SEE LICENSE IN LICENSE",
   "licenses": [
     {
       "type": "AGPL 3.0",
@@ -49,15 +50,15 @@
     "babel-eslint": "^4.1.5",
     "babel-loader": "^6.1.0",
     "babel-plugin-transform-runtime": "^6.1.18",
-    "babel-preset-es2015-loose": "^7.0.0",
     "babel-preset-es2015": "*",
+    "babel-preset-es2015-loose": "^7.0.0",
     "babel-preset-stage-0": "^6.1.18",
     "babel-runtime": "^6.1.18",
     "eslint": "^1.9.0",
     "gulp": "~3.9.0",
     "gulp-autoprefixer": "*",
     "gulp-beautify": "*",
-    "gulp-closure-compiler": "*",
+    "gulp-clean-css": "^2.0.7",
     "gulp-concat-util": "*",
     "gulp-csscomb": "*",
     "gulp-csslint": "*",
@@ -68,7 +69,6 @@
     "gulp-jshint": "*",
     "gulp-less": "1.3.6",
     "gulp-livereload": "~3.8.0",
-    "gulp-minify-css": "*",
     "gulp-notify": "~2.2.0",
     "gulp-plumber": "*",
     "gulp-rename": "*",
diff --git a/rainloop/v/0.0.0/app/templates/Index.html b/rainloop/v/0.0.0/app/templates/Index.html
index d30932d35..c6221c64f 100644
--- a/rainloop/v/0.0.0/app/templates/Index.html
+++ b/rainloop/v/0.0.0/app/templates/Index.html
@@ -26,7 +26,7 @@
 		<link type="text/css" rel="stylesheet" id="rlThemeLink" />
 		<script type="text/javascript" data-cfasync="false" src="{{BaseAppBootScriptLink}}"></script>
 		<script type="text/javascript" data-cfasync="false">
-			__includeScr('{{BaseAppDataScriptLink}}' + (window.__rlah ? window.__rlah() || '0' : '0') + '/' +  window.Math.random().toString().substr(2) + '/');
+			window.__includeAppScr('{{BaseAppDataScriptLink}}');
 		</script>
 		<script type="text/javascript" data-cfasync="false">
 			if (window.rainloopAppData && window.rainloopAppData['NewThemeLink']) {
@@ -35,7 +35,7 @@
 		</script>
 		<script type="text/javascript" data-cfasync="false">
 			if (window.rainloopAppData && window.rainloopAppData['IncludeCss']) {
-				__includeStyle(window.rainloopAppData['IncludeCss']);
+				window.__includeStyle(window.rainloopAppData['IncludeCss']);
 			}
 		</script>
 		<script type="text/javascript" data-cfasync="false"></script>