diff --git a/VERSION b/VERSION
index 928206ec..e75ae9de 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.9.5-trunk+timestamp.2014.05.09.15.22.59
+Version 2.9.5-trunk+timestamp.2014.05.09.15.41.38
diff --git a/applications/admin/static/codemirror/mode/commonlisp/commonlisp.js b/applications/admin/static/codemirror/mode/commonlisp/commonlisp.js
deleted file mode 100644
index 8fa08c8a..00000000
--- a/applications/admin/static/codemirror/mode/commonlisp/commonlisp.js
+++ /dev/null
@@ -1,105 +0,0 @@
-CodeMirror.defineMode("commonlisp", function (config) {
- var assumeBody = /^with|^def|^do|^prog|case$|^cond$|bind$|when$|unless$/;
- var numLiteral = /^(?:[+\-]?(?:\d+|\d*\.\d+)(?:[efd][+\-]?\d+)?|[+\-]?\d+(?:\/[+\-]?\d+)?|#b[+\-]?[01]+|#o[+\-]?[0-7]+|#x[+\-]?[\da-f]+)/;
- var symbol = /[^\s'`,@()\[\]";]/;
- var type;
-
- function readSym(stream) {
- var ch;
- while (ch = stream.next()) {
- if (ch == "\\") stream.next();
- else if (!symbol.test(ch)) { stream.backUp(1); break; }
- }
- return stream.current();
- }
-
- function base(stream, state) {
- if (stream.eatSpace()) {type = "ws"; return null;}
- if (stream.match(numLiteral)) return "number";
- var ch = stream.next();
- if (ch == "\\") ch = stream.next();
-
- if (ch == '"') return (state.tokenize = inString)(stream, state);
- else if (ch == "(") { type = "open"; return "bracket"; }
- else if (ch == ")" || ch == "]") { type = "close"; return "bracket"; }
- else if (ch == ";") { stream.skipToEnd(); type = "ws"; return "comment"; }
- else if (/['`,@]/.test(ch)) return null;
- else if (ch == "|") {
- if (stream.skipTo("|")) { stream.next(); return "symbol"; }
- else { stream.skipToEnd(); return "error"; }
- } else if (ch == "#") {
- var ch = stream.next();
- if (ch == "[") { type = "open"; return "bracket"; }
- else if (/[+\-=\.']/.test(ch)) return null;
- else if (/\d/.test(ch) && stream.match(/^\d*#/)) return null;
- else if (ch == "|") return (state.tokenize = inComment)(stream, state);
- else if (ch == ":") { readSym(stream); return "meta"; }
- else return "error";
- } else {
- var name = readSym(stream);
- if (name == ".") return null;
- type = "symbol";
- if (name == "nil" || name == "t") return "atom";
- if (name.charAt(0) == ":") return "keyword";
- if (name.charAt(0) == "&") return "variable-2";
- return "variable";
- }
- }
-
- function inString(stream, state) {
- var escaped = false, next;
- while (next = stream.next()) {
- if (next == '"' && !escaped) { state.tokenize = base; break; }
- escaped = !escaped && next == "\\";
- }
- return "string";
- }
-
- function inComment(stream, state) {
- var next, last;
- while (next = stream.next()) {
- if (next == "#" && last == "|") { state.tokenize = base; break; }
- last = next;
- }
- type = "ws";
- return "comment";
- }
-
- return {
- startState: function () {
- return {ctx: {prev: null, start: 0, indentTo: 0}, tokenize: base};
- },
-
- token: function (stream, state) {
- if (stream.sol() && typeof state.ctx.indentTo != "number")
- state.ctx.indentTo = state.ctx.start + 1;
-
- type = null;
- var style = state.tokenize(stream, state);
- if (type != "ws") {
- if (state.ctx.indentTo == null) {
- if (type == "symbol" && assumeBody.test(stream.current()))
- state.ctx.indentTo = state.ctx.start + config.indentUnit;
- else
- state.ctx.indentTo = "next";
- } else if (state.ctx.indentTo == "next") {
- state.ctx.indentTo = stream.column();
- }
- }
- if (type == "open") state.ctx = {prev: state.ctx, start: stream.column(), indentTo: null};
- else if (type == "close") state.ctx = state.ctx.prev || state.ctx;
- return style;
- },
-
- indent: function (state, _textAfter) {
- var i = state.ctx.indentTo;
- return typeof i == "number" ? i : state.ctx.start + 1;
- },
-
- lineComment: ";;",
- blockCommentStart: "#|",
- blockCommentEnd: "|#"
- };
-});
-
-CodeMirror.defineMIME("text/x-common-lisp", "commonlisp");
diff --git a/applications/admin/static/codemirror/mode/commonlisp/index.html b/applications/admin/static/codemirror/mode/commonlisp/index.html
deleted file mode 100644
index d48be8d2..00000000
--- a/applications/admin/static/codemirror/mode/commonlisp/index.html
+++ /dev/null
@@ -1,177 +0,0 @@
-
-
-
CodeMirror: Common Lisp mode
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-Common Lisp mode
-
-
-
- MIME types defined: text/x-common-lisp.
-
-
diff --git a/applications/admin/static/codemirror/mode/d/d.js b/applications/admin/static/codemirror/mode/d/d.js
deleted file mode 100644
index ab345f1a..00000000
--- a/applications/admin/static/codemirror/mode/d/d.js
+++ /dev/null
@@ -1,205 +0,0 @@
-CodeMirror.defineMode("d", function(config, parserConfig) {
- var indentUnit = config.indentUnit,
- statementIndentUnit = parserConfig.statementIndentUnit || indentUnit,
- keywords = parserConfig.keywords || {},
- builtin = parserConfig.builtin || {},
- blockKeywords = parserConfig.blockKeywords || {},
- atoms = parserConfig.atoms || {},
- hooks = parserConfig.hooks || {},
- multiLineStrings = parserConfig.multiLineStrings;
- var isOperatorChar = /[+\-*&%=<>!?|\/]/;
-
- var curPunc;
-
- function tokenBase(stream, state) {
- var ch = stream.next();
- if (hooks[ch]) {
- var result = hooks[ch](stream, state);
- if (result !== false) return result;
- }
- if (ch == '"' || ch == "'" || ch == "`") {
- state.tokenize = tokenString(ch);
- return state.tokenize(stream, state);
- }
- if (/[\[\]{}\(\),;\:\.]/.test(ch)) {
- curPunc = ch;
- return null;
- }
- if (/\d/.test(ch)) {
- stream.eatWhile(/[\w\.]/);
- return "number";
- }
- if (ch == "/") {
- if (stream.eat("+")) {
- state.tokenize = tokenComment;
- return tokenNestedComment(stream, state);
- }
- if (stream.eat("*")) {
- state.tokenize = tokenComment;
- return tokenComment(stream, state);
- }
- if (stream.eat("/")) {
- stream.skipToEnd();
- return "comment";
- }
- }
- if (isOperatorChar.test(ch)) {
- stream.eatWhile(isOperatorChar);
- return "operator";
- }
- stream.eatWhile(/[\w\$_]/);
- var cur = stream.current();
- if (keywords.propertyIsEnumerable(cur)) {
- if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
- return "keyword";
- }
- if (builtin.propertyIsEnumerable(cur)) {
- if (blockKeywords.propertyIsEnumerable(cur)) curPunc = "newstatement";
- return "builtin";
- }
- if (atoms.propertyIsEnumerable(cur)) return "atom";
- return "variable";
- }
-
- function tokenString(quote) {
- return function(stream, state) {
- var escaped = false, next, end = false;
- while ((next = stream.next()) != null) {
- if (next == quote && !escaped) {end = true; break;}
- escaped = !escaped && next == "\\";
- }
- if (end || !(escaped || multiLineStrings))
- state.tokenize = null;
- return "string";
- };
- }
-
- function tokenComment(stream, state) {
- var maybeEnd = false, ch;
- while (ch = stream.next()) {
- if (ch == "/" && maybeEnd) {
- state.tokenize = null;
- break;
- }
- maybeEnd = (ch == "*");
- }
- return "comment";
- }
-
- function tokenNestedComment(stream, state) {
- var maybeEnd = false, ch;
- while (ch = stream.next()) {
- if (ch == "/" && maybeEnd) {
- state.tokenize = null;
- break;
- }
- maybeEnd = (ch == "+");
- }
- return "comment";
- }
-
- function Context(indented, column, type, align, prev) {
- this.indented = indented;
- this.column = column;
- this.type = type;
- this.align = align;
- this.prev = prev;
- }
- function pushContext(state, col, type) {
- var indent = state.indented;
- if (state.context && state.context.type == "statement")
- indent = state.context.indented;
- return state.context = new Context(indent, col, type, null, state.context);
- }
- function popContext(state) {
- var t = state.context.type;
- if (t == ")" || t == "]" || t == "}")
- state.indented = state.context.indented;
- return state.context = state.context.prev;
- }
-
- // Interface
-
- return {
- startState: function(basecolumn) {
- return {
- tokenize: null,
- context: new Context((basecolumn || 0) - indentUnit, 0, "top", false),
- indented: 0,
- startOfLine: true
- };
- },
-
- token: function(stream, state) {
- var ctx = state.context;
- if (stream.sol()) {
- if (ctx.align == null) ctx.align = false;
- state.indented = stream.indentation();
- state.startOfLine = true;
- }
- if (stream.eatSpace()) return null;
- curPunc = null;
- var style = (state.tokenize || tokenBase)(stream, state);
- if (style == "comment" || style == "meta") return style;
- if (ctx.align == null) ctx.align = true;
-
- if ((curPunc == ";" || curPunc == ":" || curPunc == ",") && ctx.type == "statement") popContext(state);
- else if (curPunc == "{") pushContext(state, stream.column(), "}");
- else if (curPunc == "[") pushContext(state, stream.column(), "]");
- else if (curPunc == "(") pushContext(state, stream.column(), ")");
- else if (curPunc == "}") {
- while (ctx.type == "statement") ctx = popContext(state);
- if (ctx.type == "}") ctx = popContext(state);
- while (ctx.type == "statement") ctx = popContext(state);
- }
- else if (curPunc == ctx.type) popContext(state);
- else if (((ctx.type == "}" || ctx.type == "top") && curPunc != ';') || (ctx.type == "statement" && curPunc == "newstatement"))
- pushContext(state, stream.column(), "statement");
- state.startOfLine = false;
- return style;
- },
-
- indent: function(state, textAfter) {
- if (state.tokenize != tokenBase && state.tokenize != null) return CodeMirror.Pass;
- var ctx = state.context, firstChar = textAfter && textAfter.charAt(0);
- if (ctx.type == "statement" && firstChar == "}") ctx = ctx.prev;
- var closing = firstChar == ctx.type;
- if (ctx.type == "statement") return ctx.indented + (firstChar == "{" ? 0 : statementIndentUnit);
- else if (ctx.align) return ctx.column + (closing ? 0 : 1);
- else return ctx.indented + (closing ? 0 : indentUnit);
- },
-
- electricChars: "{}"
- };
-});
-
-(function() {
- function words(str) {
- var obj = {}, words = str.split(" ");
- for (var i = 0; i < words.length; ++i) obj[words[i]] = true;
- return obj;
- }
-
- var blockKeywords = "body catch class do else enum for foreach foreach_reverse if in interface mixin " +
- "out scope struct switch try union unittest version while with";
-
- CodeMirror.defineMIME("text/x-d", {
- name: "d",
- keywords: words("abstract alias align asm assert auto break case cast cdouble cent cfloat const continue " +
- "debug default delegate delete deprecated export extern final finally function goto immutable " +
- "import inout invariant is lazy macro module new nothrow override package pragma private " +
- "protected public pure ref return shared short static super synchronized template this " +
- "throw typedef typeid typeof volatile __FILE__ __LINE__ __gshared __traits __vector __parameters " +
- blockKeywords),
- blockKeywords: words(blockKeywords),
- builtin: words("bool byte char creal dchar double float idouble ifloat int ireal long real short ubyte " +
- "ucent uint ulong ushort wchar wstring void size_t sizediff_t"),
- atoms: words("exit failure success true false null"),
- hooks: {
- "@": function(stream, _state) {
- stream.eatWhile(/[\w\$_]/);
- return "meta";
- }
- }
- });
-}());
diff --git a/applications/admin/static/codemirror/mode/d/index.html b/applications/admin/static/codemirror/mode/d/index.html
deleted file mode 100644
index 8b25fcc5..00000000
--- a/applications/admin/static/codemirror/mode/d/index.html
+++ /dev/null
@@ -1,273 +0,0 @@
-
-
-CodeMirror: D mode
-
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-D mode
-
-
-
-
- Simple mode that handle D-Syntax (DLang Homepage).
-
- MIME types defined: text/x-d
- .
-
diff --git a/applications/admin/static/codemirror/mode/diff/diff.js b/applications/admin/static/codemirror/mode/diff/diff.js
deleted file mode 100644
index 9a0d90ea..00000000
--- a/applications/admin/static/codemirror/mode/diff/diff.js
+++ /dev/null
@@ -1,32 +0,0 @@
-CodeMirror.defineMode("diff", function() {
-
- var TOKEN_NAMES = {
- '+': 'positive',
- '-': 'negative',
- '@': 'meta'
- };
-
- return {
- token: function(stream) {
- var tw_pos = stream.string.search(/[\t ]+?$/);
-
- if (!stream.sol() || tw_pos === 0) {
- stream.skipToEnd();
- return ("error " + (
- TOKEN_NAMES[stream.string.charAt(0)] || '')).replace(/ $/, '');
- }
-
- var token_name = TOKEN_NAMES[stream.peek()] || stream.skipToEnd();
-
- if (tw_pos === -1) {
- stream.skipToEnd();
- } else {
- stream.pos = tw_pos;
- }
-
- return token_name;
- }
- };
-});
-
-CodeMirror.defineMIME("text/x-diff", "diff");
diff --git a/applications/admin/static/codemirror/mode/diff/index.html b/applications/admin/static/codemirror/mode/diff/index.html
deleted file mode 100644
index 6ceae8b3..00000000
--- a/applications/admin/static/codemirror/mode/diff/index.html
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-CodeMirror: Diff mode
-
-
-
-
-
-
-
-
-

-
-
-
-
-
-
-Diff mode
-