Merge branch 'master' into cover-fix

# Conflicts:
#	codex-editor.js
#	codex-editor.js.map
#	editor.js
#	example.html
#	modules/callbacks.js
#	modules/caret.js
#	modules/content.js
#	modules/core.js
#	modules/draw.js
#	modules/notifications.js
#	modules/parser.js
#	modules/renderer.js
#	modules/saver.js
#	modules/toolbar/inline.js
#	modules/toolbar/toolbar.js
#	modules/toolbar/toolbox.js
#	modules/tools.js
#	modules/transport.js
#	modules/ui.js
#	plugins/header/header.js
#	whatwg-fetch.js.map

editor.js

@@ -9,6 +9,7 @@
 var codex = (function(codex){
 
  var init = function() {
+
  codex.core = require('./modules/core');
  codex.ui = require('./modules/ui');
  codex.transport = require('./modules/transport');

example.html

@@ -10,8 +10,13 @@
 
 </body>
 
+<<<<<<< HEAD
 <script src="./codex-editor.js?v=108"></script>
 <link rel="stylesheet" href="./codex-editor.css?v=11000">
+=======
+<script src="./codex-editor.js?v=11"></script>
+<link rel="stylesheet" href="./codex-editor.css?v=11">
+>>>>>>> master
 
 <link rel="stylesheet" href="codex-editor.css">
 
@@ -48,8 +53,11 @@
 <script>
  codex.start({
  textareaId : "codex_area",
+<<<<<<< HEAD
  initialBlockPlugin : 'paragraph',
  uploadImagesUrl : '/hull',
+=======
+>>>>>>> master
  tools : {
  paragraph: {
  type: 'paragraph',
@@ -60,8 +68,12 @@
  render: paragraphTool.render,
  save: paragraphTool.save,
  enableLineBreaks: false,
+<<<<<<< HEAD
  allowedToPaste: true,
 // handleTagOnPaste : ['P']
+=======
+ allowedToPaste: true
+>>>>>>> master
  },
  paste: {
  type: 'paste',
@@ -84,8 +96,12 @@
  settings: headerTool.makeSettings(),
  render: headerTool.render,
  save: headerTool.save,
+<<<<<<< HEAD
  displayInToolbox: true,
 // handleTagOnPaste : ['H1', 'H2', 'H3', 'H4', 'H5', 'H6']
+=======
+ displayInToolbox: true
+>>>>>>> master
  },
  code: {
  type: 'code',
@@ -152,6 +168,10 @@
  settings: null,
  render: instagramTool.reneder,
  save: instagramTool.save,
+<<<<<<< HEAD
+=======
+ displayInToolbox: false,
+>>>>>>> master
  enableLineBreaks: false,
  allowedToPaste: false
  },
@@ -164,6 +184,10 @@
  settings: null,
  render: twitterTool.render,
  save: twitterTool.save,
+<<<<<<< HEAD
+=======
+ displayInToolbox: false,
+>>>>>>> master
  enableLineBreaks: false,
  allowedToPaste: false
  }

modules/toolbar/toolbox.js

@@ -6,6 +6,7 @@
  * @author Codex Team
  * @version 1.0
  */
+
 var toolbox = (function(toolbox) {
 
  toolbox.init = function () {

modules/tools.js

@@ -5,6 +5,7 @@
  * @author Codex Team
  * @version 1.0
  */
+
 var tools = (function(tools) {
 
  return tools;