diff --git a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ConfigurationProcessor.java b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ConfigurationProcessor.java
index 3b38c5845..c20baa622 100644
--- a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ConfigurationProcessor.java
+++ b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ConfigurationProcessor.java
@@ -89,8 +89,8 @@ public JSONArray getConfigurationInfo(int ownerId) {
             configurationInfos.put(configurationInfo);
             configurationInfo.put(program.getName());
             configurationInfo.put(program.getOwner().getAccount());
-            configurationInfo.put(program.getCreated().toString());
-            configurationInfo.put(program.getLastChanged().toString());
+            configurationInfo.put(program.getCreated().getTime());
+            configurationInfo.put(program.getLastChanged().getTime());
         }
         setSuccess(Key.CONFIGURATION_GET_ALL_SUCCESS, "" + configurationInfos.length());
         return configurationInfos;
diff --git a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ProgramProcessor.java b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ProgramProcessor.java
index d7451b120..43672be6b 100644
--- a/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ProgramProcessor.java
+++ b/OpenRobertaRobot/src/main/java/de/fhg/iais/roberta/persistence/ProgramProcessor.java
@@ -91,9 +91,9 @@ public JSONArray getProgramInfo(int ownerId, int robotId) {
             }
 
             programInfo.put(sharedWithUser);
-            programInfo.put(program.getCreated().toString());
-            programInfo.put(program.getLastChanged().toString());
-            programInfo.put(program.getLastChanged().toString());
+            programInfo.put(program.getCreated().getTime());
+            programInfo.put(program.getLastChanged().getTime());
+            programInfo.put(program.getLastChanged().getTime());
             programInfos.put(programInfo);
         }
         // Now we find all the programs which are not owned by the user but have been shared to him
@@ -104,9 +104,9 @@ public JSONArray getProgramInfo(int ownerId, int robotId) {
             programInfo2.put(accessRight.getProgram().getOwner().getAccount());
             //            programInfo2.put(userProgram.getProgram().getNumberOfBlocks());
             programInfo2.put(accessRight.getRelation().toString());
-            programInfo2.put(accessRight.getProgram().getCreated().toString());
-            programInfo2.put(accessRight.getProgram().getLastChanged().toString());
-            programInfo2.put(accessRight.getProgram().getLastChanged().toString());
+            programInfo2.put(accessRight.getProgram().getCreated().getTime());
+            programInfo2.put(accessRight.getProgram().getLastChanged().getTime());
+            programInfo2.put(accessRight.getProgram().getLastChanged().getTime());
             programInfos.put(programInfo2);
         }
 
diff --git a/OpenRobertaServer/staticResources/index.html b/OpenRobertaServer/staticResources/index.html
index d4fab87ff..c8a3bc38f 100644
--- a/OpenRobertaServer/staticResources/index.html
+++ b/OpenRobertaServer/staticResources/index.html
@@ -34,13 +34,14 @@
 <script type="text/javascript" src="/common/ui/jquery-ui-1.10.4.custom.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="/common/jquery/jquery.dataTables.min.js" charset="utf-8"></script>
 <script type="text/javascript" src="/common/bootstrap/bootstrap-3.3.1-dist/dist/js/bootstrap.min.js"></script>
-<!-- <script type="text/javascript" src="/roberta/user.js"></script>
+<script type="text/javascript" src="/roberta/user.js"></script>
 <script type="text/javascript" src="/roberta/robot.js"></script>
 <script type="text/javascript" src="/roberta/program.js"></script>
 <script type="text/javascript" src="/roberta/configuration.js"></script>
 <script type="text/javascript" src="/roberta/util.js"></script>
-<script type="text/javascript" src="/roberta/roberta.js"></script> -->
-<script type="text/javascript" src="/roberta/roberta.min.js"></script>
+<script type="text/javascript" src="/roberta/roberta.js"></script>
+<script type="text/javascript" src="/roberta/moment.js"></script>
+<!-- <script type="text/javascript" src="/roberta/roberta.min.js"></script> -->
 
 <!-- <script type="text/javascript" src="/simulation/simulationLogic/robot.js"></script>
 <script type="text/javascript" src="/simulation/simulationLogic/scene.js"></script>
diff --git a/OpenRobertaServer/staticResources/roberta/util.js b/OpenRobertaServer/staticResources/roberta/util.js
deleted file mode 100644
index bffcad254..000000000
--- a/OpenRobertaServer/staticResources/roberta/util.js
+++ /dev/null
@@ -1,228 +0,0 @@
-var UTIL = {};
-(function($) {
-    /**
-     * Set cookie
-     * 
-     * @memberof UTIL
-     * 
-     * @param {key}
-     *            Key of the cookie
-     * @param {value}
-     *            Value of the cookie
-     */
-    UTIL.setCookie = function(key, value) {
-        var expires = new Date();
-        expires.setTime(expires.getTime() + (30 * 24 * 60 * 60 * 1000));
-        document.cookie = key + '=' + value + ';expires=' + expires.toUTCString();
-    };
-
-    /**
-     * Get cookie
-     * 
-     * @memberof UTIL
-     * 
-     * @param {key}
-     *            Key of the cookie to read
-     */
-    UTIL.getCookie = function(key) {
-        var keyValue = document.cookie.match('(^|;) ?' + key + '=([^;]*)(;|$)');
-        return keyValue ? keyValue[2] : null;
-    };
-
-    /**
-     * Format date
-     * 
-     * @memberof UTIL
-     * 
-     * @param {date}
-     *            date from server to be formatted
-     */
-    UTIL.formatDate = function(dateLong) {
-        if (dateLong) {
-            var date = new Date(dateLong);
-            var datestring = ("0" + date.getDate()).slice(-2) + "." + ("0" + (date.getMonth() + 1)).slice(-2) + "." + date.getFullYear() + ", "
-                    + ("0" + date.getHours()).slice(-2) + ":" + ("0" + date.getMinutes()).slice(-2);
-            return datestring;
-//            return moment(date).format('DD.MM.YYYY, HH:mm:ss');
-        }
-        return "";
-    };
-
-    /**
-     * Format date completely (including 1/1000 - seconds)
-     * 
-     * @memberof UTIL
-     * 
-     * @param {date}
-     *            date from server to be formatted
-     */
-    UTIL.formatDateComplete = function(date) {
-        if (date) {
-            return moment(date).format('DD.MM.YYYY, HH:mm:ss.SSS');
-        }
-        return "";
-    };
-
-    /**
-     * Convert date into numeric value
-     * 
-     * @memberof UTIL
-     * 
-     * @param {d}
-     *            date in the form 'dd.mm.yyyy, hh:mm:ss'
-     */
-    UTIL.parseDate = function(d) {
-        if (d) {
-            var dayPart = d.split(', ')[0];
-            var timePart = d.split(', ')[1];
-            var day = dayPart.split('.')[0];
-            var month = dayPart.split('.')[1] - 1;
-            var year = dayPart.split('.')[2];
-            var hour = timePart.split(':')[0];
-            var minute = timePart.split(':')[1];
-            var second = timePart.split(':')[2];
-            var mseconds = timePart.split('.')[1];
-            var date = new Date(year, month, day, hour, minute, second, mseconds);
-            return date.getTime();
-        }
-        return 0;
-    };
-
-    /**
-     * Format result of server call for logging
-     * 
-     * @memberof UTIL
-     * 
-     * @param {result}
-     *            Result-object from server call
-     */
-    UTIL.formatResultLog = function(result) {
-        var str = "{";
-        var comma = false;
-        for (key in result) {
-            if (comma) {
-                str += ',';
-            } else {
-                comma = true;
-            }
-            str += '"' + key + '":';
-            if (result.hasOwnProperty(key)) {
-                // The output of items is limited to the first 100 characters
-                if (result[key].length > 100) {
-                    str += '"' + JSON.stringify(result[key]).substring(1, 100) + ' ..."';
-                } else {
-                    str += JSON.stringify(result[key]);
-                }
-            }
-        }
-        str += '}';
-        return str;
-    };
-
-    /**
-     * Extension of Jquery-datatables for sorting German date fields
-     * 
-     * @memberof UTIL
-     */
-    UTIL.initDataTables = function() {
-        jQuery.extend(jQuery.fn.dataTableExt.oSort['date-de-asc'] = function(a, b) {
-            a = UTIL.parseDate(a);
-            b = UTIL.parseDate(b);
-            return ((a < b) ? -1 : ((a > b) ? 1 : 0));
-        },
-
-        jQuery.fn.dataTableExt.oSort['date-de-desc'] = function(a, b) {
-            a = UTIL.parseDate(a);
-            b = UTIL.parseDate(b);
-            return ((a < b) ? 1 : ((a > b) ? -1 : 0));
-        });
-    };
-
-    /**
-     * Calculate height of data table
-     * 
-     * @memberof UTIL
-     */
-    UTIL.calcDataTableHeight = function() {
-        return Math.round($(window).height() - 260);
-    };
-
-    UTIL.cacheBlocks = function() {
-        userState.programBlocksSaved = null;
-        userState.programBlocks = null;
-        if (Blockly.mainWorkspace !== null) {
-            var xmlProgram = Blockly.Xml.workspaceToDom(Blockly.mainWorkspace);
-            userState.programBlocksSaved = Blockly.Xml.domToText(xmlProgram);
-            var blocks = Blockly.getMainWorkspace().getTopBlocks();
-            for (var i = 0; i < blocks.length; i++) {
-                if (blocks[i].type == "robControls_start") {
-                    var pos = blocks[i].getRelativeToSurfaceXY();
-                    blocks[i].moveBy(25 - pos.x, 25 - pos.y);
-                    break;
-                }
-            }
-            xmlProgram = Blockly.Xml.workspaceToDom(Blockly.mainWorkspace);
-            userState.programBlocks = Blockly.Xml.domToText(xmlProgram);
-            var blocks = Blockly.getMainWorkspace().getTopBlocks();
-            for (var i = 0; i < blocks.length; i++) {
-                if (blocks[i].type == "robControls_start") {
-                    var pos = blocks[i].getRelativeToSurfaceXY();
-                    blocks[i].moveBy(25 - pos.x, 25 - pos.y);
-                    break;
-                }
-            }
-        }
-    };
-
-    UTIL.checkVisibility = function() {
-        var stateKey, eventKey, keys = {
-            hidden : "visibilitychange",
-            webkitHidden : "webkitvisibilitychange",
-            mozHidden : "mozvisibilitychange",
-            msHidden : "msvisibilitychange"
-        };
-        for (stateKey in keys) {
-            if (stateKey in document) {
-                eventKey = keys[stateKey];
-                break;
-            }
-        }
-        return function(c) {
-            if (c) {
-                document.addEventListener(eventKey, c);
-            }
-            return !document[stateKey];
-        };
-    };
-
-    UTIL.getBricklyFrame = function(id) {
-        var iframe = $(id).get(0);
-        var doc;
-
-        if (iframe.contentWindow) {
-            return iframe.contentWindow;
-        }
-
-        if (iframe.window) {
-            return iframe.window;
-        }
-
-        if (!doc && iframe.contentDocument) {
-            doc = iframe.contentDocument;
-        }
-
-        if (!doc && iframe.document) {
-            doc = iframe.document;
-        }
-
-        if (doc && doc.defaultView) {
-            return doc.defaultView;
-        }
-
-        if (doc && doc.parentWindow) {
-            return doc.parentWindow;
-        }
-
-        return undefined;
-    };
-})($);