diff --git a/.travis.yml b/.travis.yml
index 8a7b6feb..a106aa64 100755
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,18 @@ node_js:
   - "5.0.0"
   - "4.0.0"
 env:
-  - NODE_ENV=travis
+  - NODE_ENV=travis TRAVIS=travis CXX=g++-4.8
 services:
   - mongodb
+  - redis
 addons:
   code_climate:
     repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
 after_script:
   - grunt coverage
diff --git a/README.md b/README.md
index baf5b889..13da4276 100755
--- a/README.md
+++ b/README.md
@@ -13,14 +13,12 @@ Current stable release: v1.3.0
 TellForm is an *opensource alternative to TypeForm* built ontop of nodejs that can create stunning forms from PDFs or from scratch
 
 ##Demo Forms
-[Job Application Example](https://stage.tellform.com/#!/forms/571a76b856d64f9e4ca73ca1) 
-
-[Contact Form Example](https://stage.tellform.com/#!/forms/57196d592601ed12074eecc0)
-
-[Patient Registration Example](https://stage.tellform.com/#!/forms/573f8329d18419854559c29c)
+[See examples here](https://tellform.com/examples) 
 
 ##Screenshots
 ![screenshot](design/screenshots/tellform_screenshot1.png)
+![screenshot](design/screenshots/analytics.png)
+![screenshot](design/screenshots/tellform_rating.png)
 
 
 ## Features	
diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js
index 0e78e7e9..e95b3bb4 100755
--- a/app/controllers/users/users.authentication.server.controller.js
+++ b/app/controllers/users/users.authentication.server.controller.js
@@ -124,7 +124,8 @@ exports.signup = function(req, res) {
 
 				// new user created
 				if (newTempUser) {
-					nev.registerTempUser(newTempUser, function (err) {
+					var URL = newTempUser[nev.options.URLFieldName];
+					nev.sendVerificationEmail(user.email, URL, function (err, info) {
 						if (err) {
 							console.log('Error: ');
 							console.log(err);
diff --git a/config/socket.io.js b/config/socket.io.js
index 4f4b7ffe..fe44f355 100644
--- a/config/socket.io.js
+++ b/config/socket.io.js
@@ -12,7 +12,7 @@ module.exports = function (app, db) {
 
 	var io = socketio(config.socketPort, { transports: ['websocket', 'polling'] });
 	var redis = require('socket.io-redis');
-	io.adapter(redis({ host: '127.0.0.1', port: 6379 }));
+	io.adapter(redis(process.env.REDIS_HOST || { host: '127.0.0.1', port: 6379 }));
 
 	// Add an event listener to the 'connection' event
 	io.on('connection', function (socket) {
diff --git a/design/screenshots/analytics.png b/design/screenshots/analytics.png
new file mode 100644
index 00000000..6e828e82
Binary files /dev/null and b/design/screenshots/analytics.png differ
diff --git a/design/screenshots/tellform_rating.png b/design/screenshots/tellform_rating.png
new file mode 100644
index 00000000..24780599
Binary files /dev/null and b/design/screenshots/tellform_rating.png differ
diff --git a/docker-compose.yml b/docker-compose.yml
index 5b1e6340..dae327c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,9 @@ services:
       - "27017:27017"
     volumes:
       - mongo-data-wt:/data/db
+  redis:
+    image: redis
+
   web:
     build: .
     volumes:
@@ -17,8 +20,10 @@ services:
       - "35729:35729"
     links:
       - db
+      - redis
     environment:
         DB_HOST: db
+        REDIS_HOST: redis
 volumes:
   mongo-data-wt:
     driver: local
diff --git a/docs/Extreme Programming:Agile/Sprints/tasks_sep13.md b/docs/Extreme Programming_Agile/Sprints/tasks_sep13.md
similarity index 100%
rename from docs/Extreme Programming:Agile/Sprints/tasks_sep13.md
rename to docs/Extreme Programming_Agile/Sprints/tasks_sep13.md
diff --git a/docs/Extreme Programming:Agile/User Stories/kiosk_userstories.md b/docs/Extreme Programming_Agile/User Stories/kiosk_userstories.md
similarity index 100%
rename from docs/Extreme Programming:Agile/User Stories/kiosk_userstories.md
rename to docs/Extreme Programming_Agile/User Stories/kiosk_userstories.md
diff --git a/docs/Extreme Programming:Agile/requirements.md b/docs/Extreme Programming_Agile/requirements.md
similarity index 100%
rename from docs/Extreme Programming:Agile/requirements.md
rename to docs/Extreme Programming_Agile/requirements.md
diff --git a/package.json b/package.json
index a987a018..4bc0b9f7 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,13 @@
   "scripts": {
     "start": "grunt",
     "test": "grunt test && grunt coveralls",
-    "setup": "node scripts/setup.js;",
-    "postinstall": "bower install --config.interactive=false; grunt build;"
+    "postinstall": "bower install --config.interactive=false; grunt build;",
+    "init": "node scripts/setup.js"
   },
   "dependencies": {
     "async": "^1.4.2",
     "aws-sdk": "^2.3.9",
+    "bcrypt": "^0.8.7",
     "body-parser": "~1.14.1",
     "bower": "~1.6.5",
     "chalk": "^1.1.3",
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
index 4af7f659..fab05cb3 100644
--- a/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
+++ b/public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html
@@ -214,6 +214,7 @@
 			Field Analytics
 		</div>
 		<div class="row col-xs-12 field-title-row">
+
 			<div class="col-xs-3">
 				<strong>{{ 'FIELD_TITLE' | translate }}</strong>
 			</div>