Merge branch 'teaser-image-and-text' into ckeditor-462

# Conflicts:
#	assets/ckeditor/plugins/accordionList/LICENSE
#	assets/ckeditor/plugins/btgrid/LICENSE.txt
#	assets/ckeditor/skins/moono/images/spinner.gif
#	assets/ckeditor/skins/moono/readme.md

assets/ckeditor/README.md

@@ -0,0 +1,39 @@
+CKEditor 4
+==========
+
+Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
+http://ckeditor.com - See LICENSE.md for license information.
+
+CKEditor is a text editor to be used inside web pages. It's not a replacement
+for desktop text editors like Word or OpenOffice, but a component to be used as
+part of web applications and websites.
+
+## Documentation
+
+The full editor documentation is available online at the following address:
+http://docs.ckeditor.com
+
+## Installation
+
+Installing CKEditor is an easy task. Just follow these simple steps:
+
+ 1. **Download** the latest version from the CKEditor website:
+    http://ckeditor.com. You should have already completed this step, but be
+    sure you have the very latest version.
+ 2. **Extract** (decompress) the downloaded file into the root of your website.
+
+**Note:** CKEditor is by default installed in the `ckeditor` folder. You can
+place the files in whichever you want though.
+
+## Checking Your Installation
+
+The editor comes with a few sample pages that can be used to verify that
+installation proceeded properly. Take a look at the `samples` directory.
+
+To test your installation, just call the following page at your website:
+
+	http://<your site>/<CKEditor installation path>/samples/index.html
+
+For example:
+
+	http://www.example.com/ckeditor/samples/index.html

assets/ckeditor/config.js

@@ -36,7 +36,7 @@ CKEDITOR.editorConfig = function( config ) {
 	// Simplify the dialog windows.
 	config.removeDialogTabs = 'image:advanced;link:advanced';
 
-	config.extraAllowedContent = 'div[*](*); ol[*](*); li[*](*); span[*](*); h4[*](*); a[*](*); section[*](*); img[*](*);';
+	config.extraAllowedContent = 'div[*](*); ol[*](*); li[*](*); span[*](*); h4[*](*); a[*](*); section[*](*); img[*](*); table[*](*)';
 
 	// ALLOW empy (no text) <i> and <span> tags for glyphicon
 	config.protectedSource.push(/<span[^>]*><\/span>/g);

assets/ckeditor/plugins/accordionList/README.md

@@ -0,0 +1,14 @@
+# Bootstrap Accordion List
+A plugin for ckeditor to allow creation of bootstrap accordion list (grouped collapsible items).
+
+This allows grouping of collapsible elements in a accordion list.
+Requires the following ckeditor Plugins:
+ - Widget
+ - [Bootstrap Collapsible Item](https://github.com/pkerspe/ckeditor-bootstrap-collapsibleItem)
+
+This plugin will add a new widget to allow you to create an accordion list in ckeditor without the need to work in source-code view.
+Allows drag and drop rearrangement of collapsible items in one group.
+
+# Version history:
+
+- __V 0.1__: First version with basic functionality

assets/ckeditor/plugins/btgrid/README.md

@@ -0,0 +1,13 @@
+# Bootstrap 3 Grid widget for CKEditor 4
+Bootstrap grid widget for CKEditor >= 4.3
+It depends on ckeditor widget plugin. http://ckeditor.com/addon/widget
+It only works properly with bootstrap 3 enabled websites since otherwise it is just some html.
+Demo video https://www.youtube.com/watch?v=Up7egPLxfdI
+
+I do reccomend to use http://ckeditor.com/builder for non development purposes.
+
+##Other Bootstrap 3 software for CKEditor 4
+
+Bootstrap 3 Quicktable https://github.com/kaido24/btquicktable
+
+Bootstrap 3 grid https://github.com/kaido24/bt_table

assets/ckeditor/plugins/btgrid/bower.json

@@ -0,0 +1,32 @@
+{
+  "name": "cke-btgrid",
+  "homepage": "https://github.com/kaido24/btgrid",
+  "authors": [
+    "kaido24"
+  ],
+  "description": "Bootstrap grid widget for Ckeditor",
+  "main": [
+    "./plugin.js",
+    "./dialog/btgrid.js",
+    "./icons/btgrid.png",
+    "./lang/en.js",
+    "./lang/fr.js",
+    "./lang/ru.js",
+    "./styles/editor.css"
+  ],
+  "keywords": [
+    "ckeditor",
+    "ckeditor-plugin"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "ckeditor": "^4.5.8"
+  }
+}

assets/ckeditor/plugins/btgrid/styles/editor.css

@@ -0,0 +1,85 @@
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.btgrid {
+  padding: 5px;
+  margin: 10px auto;
+  background: #eee;
+  border-radius: 8px;
+  border: 1px solid #ddd;
+  box-shadow: 0 1px 1px #fff inset, 0 -1px 0px #ccc inset;
+}
+.content {
+  box-shadow: 0 1px 1px #ddd inset;
+  border: 1px solid #cccccc;
+  padding: 0 5px;
+  border-radius: 5px;
+  background: #fff;
+  min-height: 5em;
+}
+
+.row {
+  margin-right: -15px;
+  margin-left: -15px;
+  padding-bottom: 5px;
+}
+.row:last-child {
+  padding-bottom:0;
+}
+.row:after, .row:before, .btgrid:before, .btgrid:after {
+  display: table;
+  content: " ";
+}
+.row:after {
+  clear: both;
+}
+:after, :before {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.col-md-1 {
+  width: 8.33333333%;
+}
+.col-md-2 {
+  width: 16.66666667%;
+}
+.col-md-3 {
+  width: 25%;
+}
+.col-md-4 {
+  width: 33.33333333%;
+}
+.col-md-5 {
+  width: 41.66666667%;
+}
+.col-md-6 {
+  width: 50%;
+}
+.col-md-7 {
+  width: 58.33333333%;
+}
+.col-md-8 {
+  width: 66.66666667%;
+}
+.col-md-9 {
+  width: 75%;
+}
+.col-md-10 {
+  width: 83.33333333%;
+}
+.col-md-11 {
+  width: 91.66666667%;
+}
+.col-md-12 {
+  width: 100%;
+}
+.col-md-1, .col-md-10, .col-md-11, .col-md-12, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9 {
+  float: left;
+  position: relative;
+  min-height: 1px;
+  padding-right: 15px;
+  padding-left: 15px;
+}