From 411c971e19e083c438a5544e6f143a21bf77548a Mon Sep 17 00:00:00 2001
From: Bjorn Harvold <bjorn@harvold.com>
Date: Mon, 23 Feb 2015 18:13:26 +0700
Subject: [PATCH] Updated to Spring v4.1.5. Set allow origins on
 WebsocketConfig.

---
 .../bearchoke_server_war_exploded.xml         |  30 +-
 .idea/workspace.xml                           | 570 ++++++++++--------
 .../bearchoke-api/bearchoke-api.iml           |  10 +-
 bearchoke-backend/bearchoke-api/pom.xml       |   4 +-
 bearchoke-backend/bearchoke-backend.iml       |  10 +-
 .../bearchoke-jpa-core/bearchoke-jpa-core.iml |  16 +-
 bearchoke-backend/bearchoke-jpa-core/pom.xml  |   4 +-
 .../bearchoke-mongo-core.iml                  |  12 +-
 .../bearchoke-mongo-core/pom.xml              |   4 +-
 .../bearchoke-platform-base.iml               |  24 +-
 .../bearchoke-platform-base/pom.xml           |   4 +-
 .../src/main/resources/log4j.xml              |   2 +-
 .../bearchoke-server/bearchoke-server.iml     |  30 +-
 .../bearchoke-server/manifest.yml             |   4 +-
 bearchoke-backend/bearchoke-server/pom.xml    |   4 +-
 .../server/config/AppCloudConfig.java         |  17 +
 .../server/config/AppLocalConfig.java         |  17 +
 .../server/config/WebSocketConfig.java        |   3 +-
 .../main/resources/server-cloud.properties    |   1 +
 .../main/resources/server-local.properties    |   1 +
 .../bearchoke-todo/bearchoke-todo.iml         |  24 +-
 bearchoke-backend/bearchoke-todo/pom.xml      |   4 +-
 .../bearchoke-user/bearchoke-user.iml         |  24 +-
 bearchoke-backend/bearchoke-user/pom.xml      |   4 +-
 .../bearchoke-webservices.iml                 |  19 +-
 .../bearchoke-webservices/pom.xml             |   4 +-
 bearchoke-backend/pom.xml                     |   4 +-
 .../app/js/constants/environment_constants.js |  20 +-
 bearchoke-frontend/pom.xml                    |   2 +-
 pom.xml                                       |   4 +-
 30 files changed, 510 insertions(+), 366 deletions(-)
 create mode 100644 bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppCloudConfig.java
 create mode 100644 bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppLocalConfig.java
 create mode 100644 bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties
 create mode 100644 bearchoke-backend/bearchoke-server/src/main/resources/server-local.properties

diff --git a/.idea/artifacts/bearchoke_server_war_exploded.xml b/.idea/artifacts/bearchoke_server_war_exploded.xml
index 1d83c90..f9b8b69 100644
--- a/.idea/artifacts/bearchoke_server_war_exploded.xml
+++ b/.idea/artifacts/bearchoke_server_war_exploded.xml
@@ -20,7 +20,7 @@
           <element id="library" level="project" name="Maven: org.jasypt:jasypt-spring31:1.9.2" />
           <element id="library" level="project" name="Maven: org.springframework.session:spring-session:1.0.0.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework.data:spring-data-redis:1.4.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.1.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context-support:4.1.5.RELEASE" />
           <element id="library" level="project" name="Maven: redis.clients:jedis:2.5.2" />
           <element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.2" />
           <element id="library" level="project" name="Maven: redis.embedded:embedded-redis:0.2" />
@@ -44,7 +44,7 @@
           <element id="library" level="project" name="Maven: org.springframework.integration:spring-integration-websocket:4.1.1.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework.integration:spring-integration-security:4.1.1.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework.integration:spring-integration-xml:4.1.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-oxm:4.1.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-oxm:4.1.5.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework.ws:spring-xml:2.2.0.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework.integration:spring-integration-mongodb:4.1.1.RELEASE" />
           <element id="library" level="project" name="Maven: com.io7m.xom:xom:1.2.10" />
@@ -55,7 +55,7 @@
           <element id="library" level="project" name="Maven: com.cenqua.clover:clover:1.3.12" />
           <element id="library" level="project" name="Maven: com.bearchoke:bearchoke-user:0.0.1-SNAPSHOT" />
           <element id="library" level="project" name="Maven: org.springframework.data:spring-data-mongodb:1.7.0.M1" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" />
           <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:1.10.0.M1" />
           <element id="library" level="project" name="Maven: org.mongodb:mongo-java-driver:2.12.3" />
           <element id="library" level="project" name="Maven: joda-time:joda-time-hibernate:1.3" />
@@ -64,8 +64,8 @@
           <element id="library" level="project" name="Maven: com.bearchoke:bearchoke-mongo-core:0.0.1-SNAPSHOT" />
           <element id="library" level="project" name="Maven: com.bearchoke:bearchoke-jpa-core:0.0.1-SNAPSHOT" />
           <element id="library" level="project" name="Maven: org.springframework.data:spring-data-jpa:1.7.1.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-orm:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.1.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-orm:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.1.5.RELEASE" />
           <element id="library" level="project" name="Maven: org.aspectj:aspectjrt:1.8.2" />
           <element id="library" level="project" name="Maven: com.atomikos:transactions-jdbc:3.9.2" />
           <element id="library" level="project" name="Maven: com.atomikos:transactions-jta:3.9.2" />
@@ -98,16 +98,16 @@
           <element id="library" level="project" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" />
           <element id="library" level="project" name="Maven: javax.annotation:javax.annotation-api:1.2" />
           <element id="library" level="project" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.3" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-messaging:4.1.4.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-test:4.1.4.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-messaging:4.1.5.RELEASE" />
+          <element id="library" level="project" name="Maven: org.springframework:spring-test:4.1.5.RELEASE" />
           <element id="library" level="project" name="Maven: org.projectreactor:reactor-net:1.1.4.RELEASE" />
           <element id="library" level="project" name="Maven: io.netty:netty-all:4.0.20.Final" />
           <element id="library" level="project" name="Maven: org.projectreactor:reactor-core:1.1.4.RELEASE" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 87214c3..a239fdc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -444,11 +444,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="126" max-vertical-offset="4095">
-              <caret line="22" column="37" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="37" />
+            <state vertical-scroll-proportion="0.26029217" vertical-offset="164" max-vertical-offset="4095">
+              <caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
               <folding />
             </state>
           </provider>
@@ -457,18 +457,118 @@
       <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-api/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0" vertical-offset="162" max-vertical-offset="1005">
-              <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1005">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-jpa-core/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1845">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-mongo-core/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1005">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="3975">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.96015936" vertical-offset="537" max-vertical-offset="4980">
-              <caret line="84" column="4" selection-start-line="84" selection-start-column="4" selection-end-line="84" selection-end-column="4" />
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="4980">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-todo/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="221" max-vertical-offset="720">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-user/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1500">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="840">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="3165">
+              <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-frontend/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
+              <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="log4j.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="1695">
+              <caret line="86" column="27" selection-start-line="86" selection-start-column="27" selection-end-line="86" selection-end-column="27" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="server-cloud.properties" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
+              <caret line="0" column="40" selection-start-line="0" selection-start-column="40" selection-end-line="0" selection-end-column="40" />
               <folding />
             </state>
           </provider>
@@ -499,11 +599,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-user/src/test/java/com/bearchoke/platform/user/UserCommandHandlerTest.java" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/java/com/bearchoke/platform/base/config/CXFConfig.java" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices/config/JaxWsConfig.java" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices/config/JaxWsBeanPostProcessor.java" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices/config/GlobalFeature.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices/config/CXFConfig.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices/impl/HelloWorldWebService.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices/impl/HelloWorldWebServiceImpl.java" />
@@ -511,7 +606,6 @@
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/WebServiceException.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/config/CXFServletConfig.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/config/CXFConfig.java" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppConfig.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/impl/HelloWorldWebServiceImpl.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/config/GlobalFeature.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/config/JaxWsBeanPostProcessor.java" />
@@ -535,10 +629,17 @@
         <option value="$PROJECT_DIR$/bearchoke-frontend/config/environments/cloudfoundry.json" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/java/com/bearchoke/platform/base/config/RabbitMQCloudConfig.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/rabbit-cloud.properties" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/rabbit-local.properties" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/manifest.yml" />
         <option value="$PROJECT_DIR$/bearchoke-frontend/app/templates/home.html" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppConfig.java" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppLocalConfig.java" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppCloudConfig.java" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources/server-local.properties" />
+        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-api/pom.xml" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-jpa-core/pom.xml" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-mongo-core/pom.xml" />
         <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/pom.xml" />
@@ -549,7 +650,6 @@
         <option value="$PROJECT_DIR$/bearchoke-backend/pom.xml" />
         <option value="$PROJECT_DIR$/bearchoke-frontend/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
-        <option value="$PROJECT_DIR$/bearchoke-backend/bearchoke-api/pom.xml" />
       </list>
     </option>
   </component>
@@ -599,7 +699,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="PackagesPane">
         <subPane>
           <PATH>
@@ -617,10 +716,6 @@
               <option name="myItemId" value="bearchoke-server" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Libraries" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewLibrariesNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -631,28 +726,8 @@
               <option name="myItemId" value="bearchoke-server" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
             </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="bearchoke-tempest" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="bearchoke-platform-base" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="bearchoke-tempest" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="bearchoke-platform-base" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
-            </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="com.bearchoke.platform.base" />
+              <option name="myItemId" value="com.bearchoke.platform.server" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -662,11 +737,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="bearchoke-platform-base" />
+              <option name="myItemId" value="bearchoke-server" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="com.bearchoke.platform.base" />
+              <option name="myItemId" value="com.bearchoke.platform.server" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
@@ -724,6 +799,7 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -746,15 +822,15 @@
     <property name="OverrideImplement.combined" value="true" />
     <property name="OverrideImplement.overriding.sorted" value="false" />
     <property name="LayoutCode.rearrangeEntriesJava" value="false" />
-    <property name="last_directory_selection" value="$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservices" />
+    <property name="last_directory_selection" value="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources" />
       <recent name="$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources" />
       <recent name="$PROJECT_DIR$/bearchoke-frontend/vendor/js/webservice" />
       <recent name="$PROJECT_DIR$/bearchoke-frontend/app/js/controllers" />
       <recent name="$PROJECT_DIR$/bearchoke-frontend/app/templates" />
-      <recent name="$PROJECT_DIR$/bearchoke-frontend/app/js/services" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/bearchoke-frontend/app/js/factories" />
@@ -766,6 +842,7 @@
       <recent name="com.bearchoke.platform.webservices" />
     </key>
     <key name="CopyClassDialog.RECENTS_KEY">
+      <recent name="com.bearchoke.platform.server.config" />
       <recent name="com.bearchoke.platform.webservice.config" />
       <recent name="com.bearchoke.platform.user" />
       <recent name="com.bearchoke.platform.server.web.controller" />
@@ -879,6 +956,17 @@
       <envs />
       <method />
     </configuration>
+    <configuration default="true" type="BashConfigurationType" factoryName="Bash">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="INTERPRETER_PATH" value="/bin/bash" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <module name="" />
+      <envs />
+      <method />
+    </configuration>
     <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
       <ExternalSystemSettings>
         <option name="executionName" />
@@ -1110,9 +1198,81 @@
       <patterns />
       <method />
     </configuration>
+    <configuration default="false" name="ToDoCommandHandlerTest" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
+      <extension name="chronon">
+        <include>
+          <pattern>
+            <option name="PATTERN" value="com.bearchoke.platform.todo.**" />
+            <option name="ENABLED" value="true" />
+          </pattern>
+        </include>
+      </extension>
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="com.bearchoke.platform.todo.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="bearchoke-todo" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="com.bearchoke.platform.todo" />
+      <option name="MAIN_CLASS_NAME" value="com.bearchoke.platform.todo.ToDoCommandHandlerTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
+    <configuration default="false" name="UserCommandHandlerTest" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
+      <extension name="chronon">
+        <include>
+          <pattern>
+            <option name="PATTERN" value="com.bearchoke.platform.user.**" />
+            <option name="ENABLED" value="true" />
+          </pattern>
+        </include>
+      </extension>
+      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
+        <pattern>
+          <option name="PATTERN" value="com.bearchoke.platform.user.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <module name="bearchoke-user" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <option name="PACKAGE_NAME" value="com.bearchoke.platform.user" />
+      <option name="MAIN_CLASS_NAME" value="com.bearchoke.platform.user.UserCommandHandlerTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" value="-ea" />
+      <option name="PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <option name="ENV_VARIABLES" />
+      <option name="PASS_PARENT_ENVS" value="true" />
+      <option name="TEST_SEARCH_SCOPE">
+        <value defaultName="singleModule" />
+      </option>
+      <envs />
+      <patterns />
+      <RunnerSettings RunnerId="Run" />
+      <ConfigurationWrapper RunnerId="Run" />
+      <method />
+    </configuration>
     <configuration default="false" name="Web" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.0.15" ALTERNATIVE_JRE_ENABLED="false" ALTERNATIVE_JRE_PATH="">
       <option name="OPEN_IN_BROWSER" value="false" />
-      <option name="COMMON_VM_ARGUMENTS" value="-Dspring.profiles.active=mongodb-local,redis-local,rabbit-local" />
+      <option name="COMMON_VM_ARGUMENTS" value="-Dspring.profiles.active=mongodb-local,redis-local,rabbit-local,local" />
       <option name="UPDATING_POLICY" value="restart-server" />
       <deployment>
         <artifact name="bearchoke-server:war">
@@ -1204,87 +1364,15 @@
         </option>
       </method>
     </configuration>
-    <configuration default="false" name="ToDoCommandHandlerTest" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
-      <extension name="chronon">
-        <include>
-          <pattern>
-            <option name="PATTERN" value="com.bearchoke.platform.todo.**" />
-            <option name="ENABLED" value="true" />
-          </pattern>
-        </include>
-      </extension>
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="com.bearchoke.platform.todo.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="bearchoke-todo" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="com.bearchoke.platform.todo" />
-      <option name="MAIN_CLASS_NAME" value="com.bearchoke.platform.todo.ToDoCommandHandlerTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
-    <configuration default="false" name="UserCommandHandlerTest" type="JUnit" factoryName="JUnit" nameIsGenerated="true">
-      <extension name="chronon">
-        <include>
-          <pattern>
-            <option name="PATTERN" value="com.bearchoke.platform.user.**" />
-            <option name="ENABLED" value="true" />
-          </pattern>
-        </include>
-      </extension>
-      <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea">
-        <pattern>
-          <option name="PATTERN" value="com.bearchoke.platform.user.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <module name="bearchoke-user" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" value="com.bearchoke.platform.user" />
-      <option name="MAIN_CLASS_NAME" value="com.bearchoke.platform.user.UserCommandHandlerTest" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" value="-ea" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="singleModule" />
-      </option>
-      <envs />
-      <patterns />
-      <RunnerSettings RunnerId="Run" />
-      <ConfigurationWrapper RunnerId="Run" />
-      <method />
-    </configuration>
     <list size="8">
       <item index="0" class="java.lang.String" itemvalue="JUnit.UserControllerTest" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.GreetingControllerTest" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.FacebookControllerTest" />
       <item index="3" class="java.lang.String" itemvalue="JUnit.AuthenticationControllerTest" />
       <item index="4" class="java.lang.String" itemvalue="JUnit.IntegrationQuotesWebSocketTest" />
-      <item index="5" class="java.lang.String" itemvalue="Tomcat Server.Web" />
-      <item index="6" class="java.lang.String" itemvalue="JUnit.ToDoCommandHandlerTest" />
-      <item index="7" class="java.lang.String" itemvalue="JUnit.UserCommandHandlerTest" />
+      <item index="5" class="java.lang.String" itemvalue="JUnit.ToDoCommandHandlerTest" />
+      <item index="6" class="java.lang.String" itemvalue="JUnit.UserCommandHandlerTest" />
+      <item index="7" class="java.lang.String" itemvalue="Tomcat Server.Web" />
     </list>
     <configuration name="&lt;template&gt;" type="TestNG" default="true" selected="false">
       <option name="MAIN_CLASS_NAME" />
@@ -1335,46 +1423,48 @@
       <workItem from="1423577884631" duration="18000" />
       <workItem from="1423634724043" duration="893000" />
       <workItem from="1424494396448" duration="2023000" />
+      <workItem from="1424687736495" duration="1294000" />
+      <workItem from="1424689169626" duration="163000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="75993000" />
+    <option name="totallyTimeSpent" value="77450000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="873" extended-state="6" />
     <editor active="true" />
     <layout>
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Grunt" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
-      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.54545456" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694763" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37644047" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Grunt" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+      <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24964234" sideWeight="0.43167305" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24964234" sideWeight="0.5006402" order="2" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3277849" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694763" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24964234" sideWeight="0.56832695" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.54545456" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32694763" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37644047" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
   </component>
   <component name="Vcs.Log.UiProperties">
@@ -1425,55 +1515,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-user/src/test/java/com/bearchoke/platform/user/UserCommandHandlerTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.7211155" vertical-offset="267" max-vertical-offset="1095">
-          <caret line="68" column="33" selection-start-line="68" selection-start-column="33" selection-end-line="68" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0.jdk/Contents/Home/src.zip!/javax/xml/ws/WebServiceException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.1992032" vertical-offset="0" max-vertical-offset="810">
-          <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
-          <caret line="18" column="61" selection-start-line="18" selection-start-column="61" selection-end-line="18" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/config/GlobalFeature.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.6405229" vertical-offset="216" max-vertical-offset="735">
-          <caret line="34" column="77" selection-start-line="34" selection-start-column="77" selection-end-line="34" selection-end-column="77" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/WebServiceException.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="0" max-vertical-offset="459">
-          <caret line="11" column="51" selection-start-line="11" selection-start-column="51" selection-end-line="11" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/src/main/java/com/bearchoke/platform/webservice/impl/HelloWorldWebServiceImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="525">
-          <caret line="14" column="42" selection-start-line="14" selection-start-column="42" selection-end-line="14" selection-end-column="42" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-frontend/app/js/controllers/registration_controller.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.67729086" vertical-offset="0" max-vertical-offset="753">
-          <caret line="34" column="4" selection-start-line="34" selection-start-column="4" selection-end-line="42" selection-end-column="6" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bearchoke-frontend/app/js/factories/mailchimp_factory.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1500">
@@ -1632,7 +1673,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.42168674" vertical-offset="0" max-vertical-offset="645">
           <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="60" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1640,7 +1680,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="600">
           <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1665,19 +1704,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3180">
-          <caret line="75" column="36" selection-start-line="74" selection-start-column="4" selection-end-line="75" selection-end-column="36" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/rabbit-cloud.properties">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
           <caret line="16" column="33" selection-start-line="16" selection-start-column="33" selection-end-line="16" selection-end-column="33" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1685,7 +1715,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
           <caret line="20" column="22" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1693,110 +1722,179 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.5745554" vertical-offset="165" max-vertical-offset="1440">
           <caret line="39" column="239" selection-start-line="39" selection-start-column="239" selection-end-line="39" selection-end-column="239" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/java/com/bearchoke/platform/base/config/RedisLocalConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="555">
+          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/redis-local.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="225" max-vertical-offset="840">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="459">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-user/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="225" max-vertical-offset="1500">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="753">
+          <caret line="0" column="40" selection-start-line="0" selection-start-column="40" selection-end-line="0" selection-end-column="40" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-todo/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.3638344" vertical-offset="223" max-vertical-offset="720">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="1026" max-vertical-offset="1695">
+          <caret line="86" column="27" selection-start-line="86" selection-start-column="27" selection-end-line="86" selection-end-column="27" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/resources/server-local.properties">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="225" max-vertical-offset="3975">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="459">
+          <caret line="0" column="44" selection-start-line="0" selection-start-column="44" selection-end-line="0" selection-end-column="44" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/java/com/bearchoke/platform/base/config/AxonCQRSCloudConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5562914" vertical-offset="0" max-vertical-offset="755">
+          <caret line="30" column="58" selection-start-line="29" selection-start-column="0" selection-end-line="30" selection-end-column="58" />
+          <folding>
+            <element signature="e#0#1068#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppLocalConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="225" max-vertical-offset="3165">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.1986755" vertical-offset="0" max-vertical-offset="755">
+          <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="14" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-frontend/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppCloudConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.19607843" vertical-offset="0" max-vertical-offset="2250">
-          <caret line="6" column="8" selection-start-line="6" selection-start-column="8" selection-end-line="6" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.23841059" vertical-offset="0" max-vertical-offset="755">
+          <caret line="12" column="14" selection-start-line="12" selection-start-column="14" selection-end-line="12" selection-end-column="14" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5562914" vertical-offset="0" max-vertical-offset="755">
+          <caret line="42" column="0" selection-start-line="42" selection-start-column="0" selection-end-line="42" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.37748346" vertical-offset="150" max-vertical-offset="3195">
+          <caret line="86" column="106" selection-start-line="86" selection-start-column="106" selection-end-line="86" selection-end-column="106" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-api/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1005">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-jpa-core/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="225" max-vertical-offset="1845">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1845">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-mongo-core/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.35947713" vertical-offset="225" max-vertical-offset="1005">
-          <caret line="26" column="4" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1005">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/java/com/bearchoke/platform/base/config/RedisLocalConfig.java">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="72" max-vertical-offset="555">
-          <caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="3975">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-platform-base/src/main/resources/redis-local.properties">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="459">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="4980">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-todo/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="126" max-vertical-offset="4095">
-          <caret line="22" column="37" selection-start-line="22" selection-start-column="4" selection-end-line="22" selection-end-column="37" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="221" max-vertical-offset="720">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-api/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-user/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0" vertical-offset="162" max-vertical-offset="1005">
-          <caret line="21" column="8" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="1500">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-server/pom.xml">
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/bearchoke-webservices/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="840">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-backend/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="224" max-vertical-offset="3165">
+          <caret line="26" column="13" selection-start-line="26" selection-start-column="13" selection-end-line="26" selection-end-column="13" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bearchoke-frontend/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
+          <caret line="6" column="17" selection-start-line="6" selection-start-column="17" selection-end-line="6" selection-end-column="17" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.96015936" vertical-offset="537" max-vertical-offset="4980">
-          <caret line="84" column="4" selection-start-line="84" selection-start-column="4" selection-end-line="84" selection-end-column="4" />
+        <state vertical-scroll-proportion="0.26029217" vertical-offset="164" max-vertical-offset="4095">
+          <caret line="24" column="27" selection-start-line="24" selection-start-column="27" selection-end-line="24" selection-end-column="27" />
           <folding />
         </state>
       </provider>
@@ -1855,7 +1953,7 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Spring|bearchoke-user</last-edited>
+          <last-edited>Spring|bearchoke-webservices</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/bearchoke-backend/bearchoke-api/bearchoke-api.iml b/bearchoke-backend/bearchoke-api/bearchoke-api.iml
index 518527b..3e88da8 100644
--- a/bearchoke-backend/bearchoke-api/bearchoke-api.iml
+++ b/bearchoke-backend/bearchoke-api/bearchoke-api.iml
@@ -26,9 +26,9 @@
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:4.0.0.RC1" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.0.RC1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
@@ -44,8 +44,8 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-cloudfoundry-connector:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-api/pom.xml b/bearchoke-backend/bearchoke-api/pom.xml
index 1c60ddd..8af2b1c 100644
--- a/bearchoke-backend/bearchoke-api/pom.xml
+++ b/bearchoke-backend/bearchoke-api/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-api</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke API (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/bearchoke-backend.iml b/bearchoke-backend/bearchoke-backend.iml
index 74691a9..2121b7b 100644
--- a/bearchoke-backend/bearchoke-backend.iml
+++ b/bearchoke-backend/bearchoke-backend.iml
@@ -24,12 +24,12 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-cloudfoundry-connector:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-jpa-core/bearchoke-jpa-core.iml b/bearchoke-backend/bearchoke-jpa-core/bearchoke-jpa-core.iml
index d19acb0..f41cf90 100644
--- a/bearchoke-backend/bearchoke-jpa-core/bearchoke-jpa-core.iml
+++ b/bearchoke-backend/bearchoke-jpa-core/bearchoke-jpa-core.iml
@@ -25,13 +25,13 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.7.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.9.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.2" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.uuid:java-uuid-generator:3.1.3" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
@@ -75,8 +75,8 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-cloudfoundry-connector:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-jpa-core/pom.xml b/bearchoke-backend/bearchoke-jpa-core/pom.xml
index 5189e50..371b74c 100644
--- a/bearchoke-backend/bearchoke-jpa-core/pom.xml
+++ b/bearchoke-backend/bearchoke-jpa-core/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-jpa-core</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke JPA Core (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/bearchoke-mongo-core/bearchoke-mongo-core.iml b/bearchoke-backend/bearchoke-mongo-core/bearchoke-mongo-core.iml
index c1d619c..25b1924 100644
--- a/bearchoke-backend/bearchoke-mongo-core/bearchoke-mongo-core.iml
+++ b/bearchoke-backend/bearchoke-mongo-core/bearchoke-mongo-core.iml
@@ -24,10 +24,10 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.7.0.M1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.10.0.M1" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.12.3" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
@@ -53,8 +53,8 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-mongo-core/pom.xml b/bearchoke-backend/bearchoke-mongo-core/pom.xml
index c4f0407..d6bb40d 100644
--- a/bearchoke-backend/bearchoke-mongo-core/pom.xml
+++ b/bearchoke-backend/bearchoke-mongo-core/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-mongo-core</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke Mongo Core (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/bearchoke-platform-base/bearchoke-platform-base.iml b/bearchoke-backend/bearchoke-platform-base/bearchoke-platform-base.iml
index 8aa2674..1b97e79 100644
--- a/bearchoke-backend/bearchoke-platform-base/bearchoke-platform-base.iml
+++ b/bearchoke-backend/bearchoke-platform-base/bearchoke-platform-base.iml
@@ -36,10 +36,10 @@
     <orderEntry type="library" name="Maven: org.jasypt:jasypt-spring31:1.9.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.4.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
     <orderEntry type="library" name="Maven: redis.embedded:embedded-redis:0.2" level="project" />
@@ -55,7 +55,7 @@
     <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-springmessaging:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-amqp:2.4" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-mongo:2.4" level="project" />
@@ -68,10 +68,10 @@
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.3.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-amqp:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.4.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.4.1.RELEASE" level="project" />
@@ -83,11 +83,11 @@
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-event:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-websocket:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-security:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-xml:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:2.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mongodb:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.7.0.M1" level="project" />
diff --git a/bearchoke-backend/bearchoke-platform-base/pom.xml b/bearchoke-backend/bearchoke-platform-base/pom.xml
index a45d8de..86fac06 100644
--- a/bearchoke-backend/bearchoke-platform-base/pom.xml
+++ b/bearchoke-backend/bearchoke-platform-base/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-platform-base</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke Platform Base (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml b/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml
index fe9f295..887429d 100644
--- a/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml
+++ b/bearchoke-backend/bearchoke-platform-base/src/main/resources/log4j.xml
@@ -84,7 +84,7 @@
     </logger>
 
     <logger name="org.springframework.web.socket" additivity="false">
-        <level value="info"/>
+        <level value="debug"/>
         <appender-ref ref="CUSTOMSTDOUT"/>
         <appender-ref ref="CUSTOMSTDERR"/>
     </logger>
diff --git a/bearchoke-backend/bearchoke-server/bearchoke-server.iml b/bearchoke-backend/bearchoke-server/bearchoke-server.iml
index 8e350ba..43a1aab 100644
--- a/bearchoke-backend/bearchoke-server/bearchoke-server.iml
+++ b/bearchoke-backend/bearchoke-server/bearchoke-server.iml
@@ -49,7 +49,7 @@
     <orderEntry type="library" name="Maven: org.jasypt:jasypt-spring31:1.9.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.4.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
     <orderEntry type="library" name="Maven: redis.embedded:embedded-redis:0.2" level="project" />
@@ -73,7 +73,7 @@
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-websocket:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-security:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-xml:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:2.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mongodb:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.io7m.xom:xom:1.2.10" level="project" />
@@ -84,7 +84,7 @@
     <orderEntry type="library" name="Maven: com.cenqua.clover:clover:1.3.12" level="project" />
     <orderEntry type="library" name="Maven: com.bearchoke:bearchoke-user:0.0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.7.0.M1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.10.0.M1" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.12.3" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time-hibernate:1.3" level="project" />
@@ -93,8 +93,8 @@
     <orderEntry type="library" name="Maven: com.bearchoke:bearchoke-mongo-core:0.0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.bearchoke:bearchoke-jpa-core:0.0.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-jpa:1.7.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-orm:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.2" level="project" />
     <orderEntry type="library" name="Maven: com.atomikos:transactions-jdbc:3.9.2" level="project" />
     <orderEntry type="library" name="Maven: com.atomikos:transactions-jta:3.9.2" level="project" />
@@ -127,16 +127,16 @@
     <orderEntry type="library" name="Maven: javax.ws.rs:javax.ws.rs-api:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.projectreactor:reactor-net:1.1.4.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.netty:netty-all:4.0.20.Final" level="project" />
     <orderEntry type="library" name="Maven: org.projectreactor:reactor-core:1.1.4.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-server/manifest.yml b/bearchoke-backend/bearchoke-server/manifest.yml
index d98c489..c2ff843 100644
--- a/bearchoke-backend/bearchoke-server/manifest.yml
+++ b/bearchoke-backend/bearchoke-server/manifest.yml
@@ -4,6 +4,6 @@ applications:
   memory: 2G
   instances: 1
   host: bearchoke-server
-  path: target/bearchoke-server-1.0.3-SNAPSHOT.war
+  path: target/bearchoke-server-1.0.2.war
   env:
-    SPRING_PROFILES_ACTIVE: mongodb-cloud,redis-cloud,rabbit-cloud
\ No newline at end of file
+    SPRING_PROFILES_ACTIVE: mongodb-cloud,redis-cloud,rabbit-cloud,cloud
\ No newline at end of file
diff --git a/bearchoke-backend/bearchoke-server/pom.xml b/bearchoke-backend/bearchoke-server/pom.xml
index 9cff833..090d3bc 100644
--- a/bearchoke-backend/bearchoke-server/pom.xml
+++ b/bearchoke-backend/bearchoke-server/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-server</artifactId>
     <packaging>war</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke Server (WAR)</name>
 
     <build>
diff --git a/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppCloudConfig.java b/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppCloudConfig.java
new file mode 100644
index 0000000..5ac42cf
--- /dev/null
+++ b/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppCloudConfig.java
@@ -0,0 +1,17 @@
+package com.bearchoke.platform.server.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * Created by Bjorn Harvold
+ * Date: 2/23/15
+ * Time: 5:47 PM
+ * Responsibility:
+ */
+@Configuration
+@Profile("cloud")
+@PropertySource(value = "classpath:server-cloud.properties")
+public class AppCloudConfig {
+}
diff --git a/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppLocalConfig.java b/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppLocalConfig.java
new file mode 100644
index 0000000..dd2c722
--- /dev/null
+++ b/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/AppLocalConfig.java
@@ -0,0 +1,17 @@
+package com.bearchoke.platform.server.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * Created by Bjorn Harvold
+ * Date: 2/23/15
+ * Time: 5:47 PM
+ * Responsibility:
+ */
+@Configuration
+@Profile("local")
+@PropertySource(value = "classpath:server-local.properties")
+public class AppLocalConfig {
+}
diff --git a/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java b/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java
index 37f30bd..e855fec 100644
--- a/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java
+++ b/bearchoke-backend/bearchoke-server/src/main/java/com/bearchoke/platform/server/config/WebSocketConfig.java
@@ -84,7 +84,8 @@ public class WebSocketConfig<S extends ExpiringSession> extends AbstractSessionW
 
     @Override
     public void configureStompEndpoints(StompEndpointRegistry registry) {
-        registry.addEndpoint("/ws").setHandshakeHandler(new SecureHandshakeHandler(preAuthAuthenticationManager))
+        log.info("WebSocket config: Allowing only origins: " + environment.getProperty("allowed.origin"));
+        registry.addEndpoint("/ws").setAllowedOrigins(environment.getProperty("allowed.origin")).setHandshakeHandler(new SecureHandshakeHandler(preAuthAuthenticationManager))
                 .withSockJS()
                 .setStreamBytesLimit(512 * 1024)
                 .setHttpMessageCacheSize(1000)
diff --git a/bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties b/bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties
new file mode 100644
index 0000000..5ba7f6e
--- /dev/null
+++ b/bearchoke-backend/bearchoke-server/src/main/resources/server-cloud.properties
@@ -0,0 +1 @@
+allowed.origin=https://www.bearchoke.com
\ No newline at end of file
diff --git a/bearchoke-backend/bearchoke-server/src/main/resources/server-local.properties b/bearchoke-backend/bearchoke-server/src/main/resources/server-local.properties
new file mode 100644
index 0000000..f49c7ee
--- /dev/null
+++ b/bearchoke-backend/bearchoke-server/src/main/resources/server-local.properties
@@ -0,0 +1 @@
+allowed.origin=http://dev.bearchoke.com:8000
\ No newline at end of file
diff --git a/bearchoke-backend/bearchoke-todo/bearchoke-todo.iml b/bearchoke-backend/bearchoke-todo/bearchoke-todo.iml
index 626e002..b5c8728 100644
--- a/bearchoke-backend/bearchoke-todo/bearchoke-todo.iml
+++ b/bearchoke-backend/bearchoke-todo/bearchoke-todo.iml
@@ -41,8 +41,8 @@
     <orderEntry type="library" name="Maven: org.jasypt:jasypt-spring31:1.9.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.4.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
     <orderEntry type="library" name="Maven: redis.embedded:embedded-redis:0.2" level="project" />
@@ -50,7 +50,7 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava-annotations:r03" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava-base:r03" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-springmessaging:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-amqp:2.4" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-mongo:2.4" level="project" />
@@ -62,7 +62,7 @@
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.3.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-amqp:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.4.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.4.1.RELEASE" level="project" />
@@ -74,11 +74,11 @@
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-event:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-websocket:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-security:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-xml:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:2.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mongodb:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.7.0.M1" level="project" />
@@ -119,11 +119,11 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-cloudfoundry-connector:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-todo/pom.xml b/bearchoke-backend/bearchoke-todo/pom.xml
index 8c50787..1d07c51 100644
--- a/bearchoke-backend/bearchoke-todo/pom.xml
+++ b/bearchoke-backend/bearchoke-todo/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-todo</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke ToDo (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/bearchoke-user/bearchoke-user.iml b/bearchoke-backend/bearchoke-user/bearchoke-user.iml
index 4560162..816fb20 100644
--- a/bearchoke-backend/bearchoke-user/bearchoke-user.iml
+++ b/bearchoke-backend/bearchoke-user/bearchoke-user.iml
@@ -41,7 +41,7 @@
     <orderEntry type="library" name="Maven: org.jasypt:jasypt-spring31:1.9.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.session:spring-session:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:1.4.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: redis.clients:jedis:2.5.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.2" level="project" />
     <orderEntry type="library" name="Maven: redis.embedded:embedded-redis:0.2" level="project" />
@@ -49,7 +49,7 @@
     <orderEntry type="library" name="Maven: com.google.guava:guava-annotations:r03" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava-base:r03" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-springmessaging:2.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-amqp:2.4" level="project" />
     <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:3.2.3" level="project" />
     <orderEntry type="library" name="Maven: org.axonframework:axon-mongo:2.4" level="project" />
@@ -60,7 +60,7 @@
     <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.1.3.Final" level="project" />
     <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.3.GA" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-test:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-amqp:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:1.4.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:1.4.1.RELEASE" level="project" />
@@ -72,10 +72,10 @@
     <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-event:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-websocket:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-websocket:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-security:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-xml:4.1.1.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.ws:spring-xml:2.2.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.integration:spring-integration-mongodb:4.1.1.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: com.io7m.xom:xom:1.2.10" level="project" />
@@ -99,10 +99,10 @@
     <orderEntry type="library" name="Maven: com.cenqua.clover:clover:1.3.12" level="project" />
     <orderEntry type="module" module-name="bearchoke-mongo-core" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-mongodb:1.7.0.M1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-tx:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:1.10.0.M1" level="project" />
     <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.12.3" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.3" level="project" />
@@ -110,10 +110,10 @@
     <orderEntry type="library" name="Maven: com.fasterxml.uuid:java-uuid-generator:3.1.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:4.0.0.RC1" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:4.0.0.RC1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-web:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
@@ -130,7 +130,7 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-cloudfoundry-connector:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-user/pom.xml b/bearchoke-backend/bearchoke-user/pom.xml
index 901b009..cbd7863 100644
--- a/bearchoke-backend/bearchoke-user/pom.xml
+++ b/bearchoke-backend/bearchoke-user/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-user</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke User (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/bearchoke-webservices/bearchoke-webservices.iml b/bearchoke-backend/bearchoke-webservices/bearchoke-webservices.iml
index 0268e72..638c183 100644
--- a/bearchoke-backend/bearchoke-webservices/bearchoke-webservices.iml
+++ b/bearchoke-backend/bearchoke-webservices/bearchoke-webservices.iml
@@ -1,5 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="Spring" name="Spring">
+      <configuration>
+        <fileset id="fileset" name="Spring Application Context" removed="false">
+          <file>file://$MODULE_DIR$/src/main/java/com/bearchoke/platform/webservice/config/CXFConfig.java</file>
+        </fileset>
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
@@ -49,12 +58,12 @@
     <orderEntry type="library" scope="RUNTIME" name="Maven: log4j:log4j:1.2.17" level="project" />
     <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.14.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-context:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-aop:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.4.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.4.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-core:4.1.5.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-expression:4.1.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-spring-service-connector:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-core:1.0.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-cloudfoundry-connector:1.0.0.RELEASE" level="project" />
diff --git a/bearchoke-backend/bearchoke-webservices/pom.xml b/bearchoke-backend/bearchoke-webservices/pom.xml
index a160f2a..d49cfa1 100644
--- a/bearchoke-backend/bearchoke-webservices/pom.xml
+++ b/bearchoke-backend/bearchoke-webservices/pom.xml
@@ -19,12 +19,12 @@
 	<parent>
 		<groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-backend</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
 	</parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-webservices</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke Web Services (JAR)</name>
 
     <dependencies>
diff --git a/bearchoke-backend/pom.xml b/bearchoke-backend/pom.xml
index ef901e4..3ea898a 100644
--- a/bearchoke-backend/pom.xml
+++ b/bearchoke-backend/pom.xml
@@ -19,12 +19,12 @@
     <parent>
         <groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-tempest</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-backend</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke Backend (POM)</name>
 
     <modules>
diff --git a/bearchoke-frontend/app/js/constants/environment_constants.js b/bearchoke-frontend/app/js/constants/environment_constants.js
index deb125f..e4a010e 100644
--- a/bearchoke-frontend/app/js/constants/environment_constants.js
+++ b/bearchoke-frontend/app/js/constants/environment_constants.js
@@ -1,21 +1,21 @@
 angular.module('app').constant('configuration', {
     siteName: 'Bearchoke Tempest',
     facebookApiToken: '1406544132926146',
-    mixpanelApiToken: 'af496858fbad6db085f002140fd3c9e1',
-    serverHostName: 'dev.bearchoke.com',
-	websocketServerHostName: 'dev.bearchoke.com',
-    serverProtocol: 'http',
-    serverPort: '8080',
-	websocketServerPort: '8080',
+    mixpanelApiToken: 'a96207d97a5b101c5ec844502caba117',
+    serverHostName: 'api.bearchoke.com',
+	websocketServerHostName: 'bearchoke-server.cfapps.io',
+    serverProtocol: 'https',
+    serverPort: '',
+	websocketServerPort: '4443',
     serverContext: '/api',
     serverWebSocketContext: '/ws',
     serverWebServicesContext: '/services',
-    baseUrl: 'http://dev.bearchoke.com:8080/api',
-    websocketBaseUrl: 'http://dev.bearchoke.com:8080/ws',
-    webservicesBaseUrl: 'http://dev.bearchoke.com:8080/services',
+    baseUrl: 'https://api.bearchoke.com:/api',
+    websocketBaseUrl: 'https://bearchoke-server.cfapps.io:4443/ws',
+    webservicesBaseUrl: 'https://api.bearchoke.com:/services',
     version: 'application/vnd.bearchoke-v1+json',
     mailchimpUsername: 'cfapps',
     mailchimpU: '6e09b949dd8c5be5b4befdfeb',
     mailchimpDc: 'us9',
-    mailchimpId: '670f539e60'
+    mailchimpId: 'cd1b6d791f'
   });
diff --git a/bearchoke-frontend/pom.xml b/bearchoke-frontend/pom.xml
index 2080fe1..0c63b1b 100644
--- a/bearchoke-frontend/pom.xml
+++ b/bearchoke-frontend/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.bearchoke</groupId>
         <artifactId>bearchoke-tempest</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.0.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>bearchoke-frontend</artifactId>
diff --git a/pom.xml b/pom.xml
index 3dfc9cd..fbd24f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <groupId>com.bearchoke</groupId>
     <artifactId>bearchoke-tempest</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
     <name>Bearchoke Tempest (POM)</name>
     <inceptionYear>2013</inceptionYear>
     <organization>
@@ -258,7 +258,7 @@
 		<spring.security.version>4.0.0.RC1</spring.security.version>
 		<spring.session.version>1.0.0.RELEASE</spring.session.version>
 		<spring.social.version>1.1.0.RELEASE</spring.social.version>
-		<spring.version>4.1.4.RELEASE</spring.version>
+		<spring.version>4.1.5.RELEASE</spring.version>
 		<springockito.annotations-version>1.0.9</springockito.annotations-version>
 		<tomcat.maven.plugin.version>2.2</tomcat.maven.plugin.version>
 		<tomcat.embed.version>8.0.15</tomcat.embed.version>