Merge branch 'master' into release.1.7

README.md

@@ -1,2 +1,49 @@
-# codex.editor
-CodeX Editor sources
+### NOTE
+
+At the moment we working hard on the CodeX Editor 2.0 with completely new core, new API and great new documentation. Stay tuned and subsribe to us on the Twitter. Be in the front.
+
+[http://twitter.com/codex_team](http://twitter.com/codex_team)
+
+---
+
+# CodeX Editor
+Next generation Editor for modern web applications.
+
+### Block-styled
+
+Entry composed by different and extended list of Blocks
+
+### JSON as output
+
+Outputs clear Blocks data via JSON
+
+```json
+{
+  "blocks": [
+    {
+      "type": "paragraph",
+      "data": {
+        "text": "There is a first paragraph"
+      }
+    },
+    {
+      "type": "header",
+      "data": {
+        "text": "Aaand here is a Header",
+        "type": "H2"
+      }
+    },
+   ...
+  ]
+}
+```
+
+### API oriented
+
+Focused on the Plugins API that allows to create amazing Blocks
+
+### Native JS
+
+Zero-dependency — use everywhere you want
+
+