Web Editor

With the chat added
Merge branch 'master' of https://github.com/josiasMO/ace-master

add username and peername variables for given names of users

Conflicts:
	LICENSE
	ace-server.py
	ace.html
	ace/ace.js
	ace/anonymous.png
	ace/ext-beautify.js
	ace/ext-chromevox.js
	ace/ext-elastic_tabstops_lite.js
	ace/ext-emmet.js
	ace/ext-error_marker.js
	ace/ext-keybinding_menu.js
	ace/ext-language_tools.js
	ace/ext-linking.js
	ace/ext-modelist.js
	ace/ext-old_ie.js
	ace/ext-searchbox.js
	ace/ext-settings_menu.js
	ace/ext-spellcheck.js
	ace/ext-split.js
	ace/ext-static_highlight.js
	ace/ext-statusbar.js
	ace/ext-textarea.js
	ace/ext-themelist.js
	ace/ext-whitespace.js
	ace/keybinding-emacs.js
	ace/keybinding-vim.js
	ace/mode-abap.js
	ace/mode-actionscript.js
	ace/mode-ada.js
	ace/mode-apache_conf.js
	ace/mode-applescript.js
	ace/mode-asciidoc.js
	ace/mode-assembly_x86.js
	ace/mode-autohotkey.js
	ace/mode-batchfile.js
	ace/mode-c9search.js
	ace/mode-c_cpp.js
	ace/mode-cirru.js
	ace/mode-clojure.js
	ace/mode-cobol.js
	ace/mode-coffee.js
	ace/mode-coldfusion.js
	ace/mode-csharp.js
	ace/mode-css.js
	ace/mode-curly.js
	ace/mode-d.js
	ace/mode-dart.js
	ace/mode-diff.js
	ace/mode-django.js
	ace/mode-dockerfile.js
	ace/mode-dot.js
	ace/mode-eiffel.js
	ace/mode-ejs.js
	ace/mode-elm.js
	ace/mode-erlang.js
	ace/mode-forth.js
	ace/mode-ftl.js
	ace/mode-gcode.js
	ace/mode-gherkin.js
	ace/mode-gitignore.js
	ace/mode-glsl.js
	ace/mode-golang.js
	ace/mode-groovy.js
	ace/mode-haml.js
	ace/mode-handlebars.js
	ace/mode-haskell.js
	ace/mode-haxe.js
	ace/mode-html.js
	ace/mode-html_ruby.js
	ace/mode-ini.js
	ace/mode-io.js
	ace/mode-jack.js
	ace/mode-jade.js
	ace/mode-java.js
	ace/mode-javascript.js
	ace/mode-json.js
	ace/mode-jsoniq.js
	ace/mode-jsp.js
	ace/mode-jsx.js
	ace/mode-julia.js
	ace/mode-latex.js
	ace/mode-less.js
	ace/mode-liquid.js
	ace/mode-lisp.js
	ace/mode-livescript.js
	ace/mode-logiql.js
	ace/mode-lsl.js
	ace/mode-lua.js
	ace/mode-luapage.js
	ace/mode-lucene.js
	ace/mode-makefile.js
	ace/mode-markdown.js
	ace/mode-matlab.js
	ace/mode-mel.js
	ace/mode-mushcode.js
	ace/mode-mysql.js
	ace/mode-nix.js
	ace/mode-objectivec.js
	ace/mode-ocaml.js
	ace/mode-pascal.js
	ace/mode-perl.js
	ace/mode-pgsql.js
	ace/mode-php.js
	ace/mode-plain_text.js
	ace/mode-powershell.js
	ace/mode-praat.js
	ace/mode-prolog.js
	ace/mode-properties.js
	ace/mode-protobuf.js
	ace/mode-python.js
	ace/mode-r.js
	ace/mode-rdoc.js
	ace/mode-rhtml.js
	ace/mode-ruby.js
	ace/mode-rust.js
	ace/mode-sass.js
	ace/mode-scad.js
	ace/mode-scala.js
	ace/mode-scheme.js
	ace/mode-scss.js
	ace/mode-sh.js
	ace/mode-sjs.js
	ace/mode-smarty.js
	ace/mode-snippets.js
	ace/mode-soy_template.js
	ace/mode-space.js
	ace/mode-sql.js
	ace/mode-stylus.js
	ace/mode-svg.js
	ace/mode-tcl.js
	ace/mode-tex.js
	ace/mode-text.js
	ace/mode-textile.js
	ace/mode-toml.js
	ace/mode-twig.js
	ace/mode-typescript.js
	ace/mode-vala.js
	ace/mode-vbscript.js
	ace/mode-velocity.js
	ace/mode-verilog.js
	ace/mode-vhdl.js
	ace/mode-xml.js
	ace/mode-xquery.js
	ace/mode-yaml.js
	ace/snippets/abap.js
	ace/snippets/actionscript.js
	ace/snippets/ada.js
	ace/snippets/apache_conf.js
	ace/snippets/applescript.js
	ace/snippets/asciidoc.js
	ace/snippets/assembly_x86.js
	ace/snippets/autohotkey.js
	ace/snippets/batchfile.js
	ace/snippets/c9search.js
	ace/snippets/c_cpp.js
	ace/snippets/cirru.js
	ace/snippets/clojure.js
	ace/snippets/cobol.js
	ace/snippets/coffee.js
	ace/snippets/coldfusion.js
	ace/snippets/csharp.js
	ace/snippets/css.js
	ace/snippets/curly.js
	ace/snippets/d.js
	ace/snippets/dart.js
	ace/snippets/diff.js
	ace/snippets/django.js
	ace/snippets/dockerfile.js
	ace/snippets/dot.js
	ace/snippets/eiffel.js
	ace/snippets/ejs.js
	ace/snippets/elm.js
	ace/snippets/erlang.js
	ace/snippets/forth.js
	ace/snippets/ftl.js
	ace/snippets/gcode.js
	ace/snippets/gherkin.js
	ace/snippets/gitignore.js
	ace/snippets/glsl.js
	ace/snippets/golang.js
	ace/snippets/groovy.js
	ace/snippets/haml.js
	ace/snippets/handlebars.js
	ace/snippets/haskell.js
	ace/snippets/haxe.js
	ace/snippets/html.js
	ace/snippets/html_ruby.js
	ace/snippets/ini.js
	ace/snippets/io.js
	ace/snippets/jack.js
	ace/snippets/jade.js
	ace/snippets/java.js
	ace/snippets/javascript.js
	ace/snippets/json.js
	ace/snippets/jsoniq.js
	ace/snippets/jsp.js
	ace/snippets/jsx.js
	ace/snippets/julia.js
	ace/snippets/latex.js
	ace/snippets/less.js
	ace/snippets/liquid.js
	ace/snippets/lisp.js
	ace/snippets/livescript.js
	ace/snippets/logiql.js
	ace/snippets/lsl.js
	ace/snippets/lua.js
	ace/snippets/luapage.js
	ace/snippets/lucene.js
	ace/snippets/makefile.js
	ace/snippets/markdown.js
	ace/snippets/matlab.js
	ace/snippets/mel.js
	ace/snippets/mushcode.js
	ace/snippets/mysql.js
	ace/snippets/nix.js
	ace/snippets/objectivec.js
	ace/snippets/ocaml.js
	ace/snippets/pascal.js
	ace/snippets/perl.js
	ace/snippets/pgsql.js
	ace/snippets/php.js
	ace/snippets/plain_text.js
	ace/snippets/powershell.js
	ace/snippets/praat.js
	ace/snippets/prolog.js
	ace/snippets/properties.js
	ace/snippets/protobuf.js
	ace/snippets/python.js
	ace/snippets/r.js
	ace/snippets/rdoc.js
	ace/snippets/rhtml.js
	ace/snippets/ruby.js
	ace/snippets/rust.js
	ace/snippets/sass.js
	ace/snippets/scad.js
	ace/snippets/scala.js
	ace/snippets/scheme.js
	ace/snippets/scss.js
	ace/snippets/sh.js
	ace/snippets/sjs.js
	ace/snippets/smarty.js
	ace/snippets/snippets.js
	ace/snippets/soy_template.js
	ace/snippets/space.js
	ace/snippets/sql.js
	ace/snippets/stylus.js
	ace/snippets/svg.js
	ace/snippets/tcl.js
	ace/snippets/tex.js
	ace/snippets/text.js
	ace/snippets/textile.js
	ace/snippets/toml.js
	ace/snippets/twig.js
	ace/snippets/typescript.js
	ace/snippets/vala.js
	ace/snippets/vbscript.js
	ace/snippets/velocity.js
	ace/snippets/verilog.js
	ace/snippets/vhdl.js
	ace/snippets/xml.js
	ace/snippets/xquery.js
	ace/snippets/yaml.js
	ace/theme-ambiance.js
	ace/theme-chaos.js
	ace/theme-chrome.js
	ace/theme-clouds.js
	ace/theme-clouds_midnight.js
	ace/theme-cobalt.js
	ace/theme-crimson_editor.js
	ace/theme-dawn.js
	ace/theme-dreamweaver.js
	ace/theme-eclipse.js
	ace/theme-github.js
	ace/theme-idle_fingers.js
	ace/theme-katzenmilch.js
	ace/theme-kr_theme.js
	ace/theme-kuroir.js
	ace/theme-merbivore.js
	ace/theme-merbivore_soft.js
	ace/theme-mono_industrial.js
	ace/theme-monokai.js
	ace/theme-pastel_on_dark.js
	ace/theme-solarized_dark.js
	ace/theme-solarized_light.js
	ace/theme-terminal.js
	ace/theme-textmate.js
	ace/theme-tomorrow.js
	ace/theme-tomorrow_night.js
	ace/theme-tomorrow_night_blue.js
	ace/theme-tomorrow_night_bright.js
	ace/theme-tomorrow_night_eighties.js
	ace/theme-twilight.js
	ace/theme-vibrant_ink.js
	ace/theme-xcode.js
	ace/worker-coffee.js
	ace/worker-css.js
	ace/worker-html.js
	ace/worker-javascript.js
	ace/worker-json.js
	ace/worker-lua.js
	ace/worker-php.js
	ace/worker-xquery.js