diff --git a/composer.json b/composer.json
index 7f170ce..a2d2c7f 100644
--- a/composer.json
+++ b/composer.json
@@ -5,7 +5,9 @@
   "license": "GPL-2.0+",
   "require": {
     "composer/installers": "^1.0.21",
-    "wikimedia/composer-merge-plugin": "~1.3"
+    "wikimedia/composer-merge-plugin": "~1.3",
+    "mustache/mustache": "^2.9",
+    "xamin/handlebars.php": "^0.10.3"
   },
   "replace": {
     "drupal/core": "~8.0"
diff --git a/composer.lock b/composer.lock
index 3253536..91123da 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "dac77f10c1f7585fd1f7344c6a376338",
-    "content-hash": "73cbcb262208c5d802cb528279f2a95c",
+    "hash": "19a264ce0fd69446b2342387e0c8ff63",
+    "content-hash": "b443cbefb1b845decb62e9d37d5ab81c",
     "packages": [
         {
             "name": "composer/installers",
@@ -913,6 +913,52 @@
             "time": "2015-06-07 08:43:18"
         },
         {
+            "name": "mustache/mustache",
+            "version": "v2.9.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bobthecow/mustache.php.git",
+                "reference": "c745b01956caf27d26b55a72a90aff56bc169cd6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/c745b01956caf27d26b55a72a90aff56bc169cd6",
+                "reference": "c745b01956caf27d26b55a72a90aff56bc169cd6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.4"
+            },
+            "require-dev": {
+                "fabpot/php-cs-fixer": "~1.6",
+                "phpunit/phpunit": "~3.7|~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Mustache": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Justin Hileman",
+                    "email": "justin@justinhileman.info",
+                    "homepage": "http://justinhileman.com"
+                }
+            ],
+            "description": "A Mustache implementation in PHP.",
+            "homepage": "https://github.com/bobthecow/mustache.php",
+            "keywords": [
+                "mustache",
+                "templating"
+            ],
+            "time": "2015-08-15 19:23:13"
+        },
+        {
             "name": "psr/http-message",
             "version": "1.0",
             "source": {
@@ -2028,6 +2074,48 @@
             "time": "2015-11-06 20:31:16"
         },
         {
+            "name": "xamin/handlebars.php",
+            "version": "v0.10.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/XaminProject/handlebars.php.git",
+                "reference": "5e1db1d1c7969fae32eab331a3b4d9b93257a709"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/XaminProject/handlebars.php/zipball/5e1db1d1c7969fae32eab331a3b4d9b93257a709",
+                "reference": "5e1db1d1c7969fae32eab331a3b4d9b93257a709",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4",
+                "squizlabs/php_codesniffer": "~1.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Handlebars": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "fzerorubigd",
+                    "email": "fzerorubigd@gmail.com"
+                },
+                {
+                    "name": "Behrooz Shabani (everplays)",
+                    "email": "everplays@gmail.com"
+                }
+            ],
+            "description": "Handlebars processor for php",
+            "homepage": "https://github.com/XaminProject/handlebars.php",
+            "time": "2015-08-06 22:16:36"
+        },
+        {
             "name": "zendframework/zend-diactoros",
             "version": "1.1.3",
             "source": {
@@ -2635,7 +2723,7 @@
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/10d7c48c9a4129463052321b52450d98983c4332",
+                "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/5bf53fa36afb7e2f378905c6f118527cefe205ad",
                 "reference": "10d7c48c9a4129463052321b52450d98983c4332",
                 "shasum": ""
             },
@@ -3740,39 +3828,8 @@
     "aliases": [],
     "minimum-stability": "dev",
     "stability-flags": {
-        "php": 0,
-        "symfony/class-loader": 0,
-        "symfony/console": 0,
-        "symfony/dependency-injection": 0,
-        "symfony/event-dispatcher": 0,
-        "symfony/http-foundation": 0,
-        "symfony/http-kernel": 0,
-        "symfony/routing": 0,
-        "symfony/serializer": 0,
-        "symfony/translation": 0,
-        "symfony/validator": 0,
-        "symfony/process": 0,
-        "symfony/yaml": 0,
-        "twig/twig": 0,
-        "doctrine/common": 0,
-        "doctrine/annotations": 0,
-        "guzzlehttp/guzzle": 0,
-        "symfony-cmf/routing": 0,
-        "easyrdf/easyrdf": 0,
-        "zendframework/zend-feed": 0,
-        "stack/builder": 0,
-        "egulias/email-validator": 0,
-        "masterminds/html5": 0,
-        "symfony/psr-http-message-bridge": 0,
-        "zendframework/zend-diactoros": 0,
-        "composer/semver": 0,
-        "behat/mink": 0,
-        "behat/mink-goutte-driver": 0,
         "jcalderonzumba/gastonjs": 20,
-        "jcalderonzumba/mink-phantomjs-driver": 20,
-        "mikey179/vfsstream": 0,
-        "phpunit/phpunit": 0,
-        "symfony/css-selector": 0
+        "jcalderonzumba/mink-phantomjs-driver": 20
     },
     "prefer-stable": true,
     "prefer-lowest": false,
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index ce872d4..7fe1856 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -172,17 +172,17 @@ function config_get_config_directory($type) {
  * Calling drupal_get_filename('module', 'foo') will give you one of
  * the above, depending on where the module is located.
  *
- * @param $type
+ * @param string $type
  *   The type of the item; one of 'core', 'profile', 'module', 'theme', or
  *   'theme_engine'.
- * @param $name
+ * @param string $name
  *   The name of the item for which the filename is requested. Ignored for
  *   $type 'core'.
- * @param $filename
- *   The filename of the item if it is to be set explicitly rather
- *   than by consulting the database.
+ * @param string|null
+ *   (optional) The filename of the item if it is to be set explicitly rather
+ *   than by consulting the database. Defaults to NULL.
  *
- * @return
+ * @return string|null
  *   The filename of the requested item or NULL if the item is not found.
  */
 function drupal_get_filename($type, $name, $filename = NULL) {
@@ -847,19 +847,20 @@ function drupal_classloader_register($name, $path) {
  * }
  * @endcode
  *
- * @param $name
+ * @param string $name
  *   Globally unique name for the variable. For a function with only one static,
  *   variable, the function name (e.g. via the PHP magic __FUNCTION__ constant)
  *   is recommended. For a function with multiple static variables add a
  *   distinguishing suffix to the function name for each one.
- * @param $default_value
- *   Optional default value.
- * @param $reset
- *   TRUE to reset one or all variables(s). This parameter is only used
- *   internally and should not be passed in; use drupal_static_reset() instead.
- *   (This function's return value should not be used when TRUE is passed in.)
- *
- * @return
+ * @param mixed $default_value
+ *   (optional) The default value. Defaults to NULL.
+ * @param bool $reset
+ *   (optional) TRUE to reset one or all variables(s). This parameter is only
+ *   used internally and should not be passed in; use drupal_static_reset()
+ *   instead. (This function's return value should not be used when TRUE is
+ *   passed in.)
+ *
+ * @return mixed
  *   Returns a variable by reference.
  *
  * @see drupal_static_reset()
diff --git a/core/includes/common.inc b/core/includes/common.inc
index 5d62aad..ec1b4aa 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -239,10 +239,10 @@ function check_url($uri) {
 /**
  * Generates a string representation for the given byte count.
  *
- * @param $size
+ * @param int $size
  *   A size in bytes.
- * @param $langcode
- *   Optional language code to translate to a language other than what is used
+ * @param string $langcode
+ *   (optional) Language code to translate to a language other than what is used
  *   to display the page.
  *
  * @return \Drupal\Core\StringTranslation\TranslatableMarkup
@@ -1015,8 +1015,8 @@ function element_info($type) {
  * @param $property_name
  *   The property within the element type that should be returned.
  * @param $default
- *   (Optional) The value to return if the element type does not specify a
- *   value for the property. Defaults to NULL.
+ *   (optional) The value to return if the element type does not specify a value
+ *   for the property. Defaults to NULL.
  *
  * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
  *   Use \Drupal::service('element_info')->getInfoProperty() instead.
diff --git a/core/includes/database.inc b/core/includes/database.inc
index 477e843..6e75c47 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -294,9 +294,9 @@ function db_select($table, $alias = NULL, array $options = array()) {
  * Returns a new transaction object for the active database.
  *
  * @param string $name
- *   Optional name of the transaction.
+ *   (optional) The name of the transaction.
  * @param array $options
- *   An array of options to control how the transaction operates:
+ *   (optional) An array of options to control how the transaction operates:
  *   - target: The database target name.
  *
  * @return \Drupal\Core\Database\Transaction
@@ -320,8 +320,9 @@ function db_transaction($name = NULL, array $options = array()) {
 /**
  * Sets a new active database.
  *
- * @param $key
- *   The key in the $databases array to set as the default database.
+ * @param string $key
+ *   (optional) The key in the $databases array to set as the default database.
+ *   Defaults to string 'default'.
  *
  * @return string|null
  *   The key of the formerly active database.
diff --git a/core/includes/errors.inc b/core/includes/errors.inc
index 39d8ffd..68176c3 100644
--- a/core/includes/errors.inc
+++ b/core/includes/errors.inc
@@ -92,7 +92,8 @@ function _drupal_error_handler_real($error_level, $message, $filename, $line, $c
  * will be examined to determine if it should be displayed.
  *
  * @param $error
- *   Optional error to examine for ERROR_REPORTING_DISPLAY_SOME.
+ *   (optional) An error to examine for ERROR_REPORTING_DISPLAY_SOME. Defaults
+ *   to NULL.
  *
  * @return
  *   TRUE if an error should be displayed.
diff --git a/core/includes/file.inc b/core/includes/file.inc
index b9c217b..73bb8f2 100644
--- a/core/includes/file.inc
+++ b/core/includes/file.inc
@@ -4,7 +4,6 @@
  * @file
  * API for handling file uploads and server file management.
  */
-
 use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Component\PhpStorage\FileStorage;
@@ -19,7 +18,7 @@
  * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
  *   Use \Drupal\Core\File\FileSystem::CHMOD_DIRECTORY.
  */
-const FILE_CHMOD_DIRECTORY = FileSystem::CHMOD_DIRECTORY;
+    const FILE_CHMOD_DIRECTORY = FileSystem::CHMOD_DIRECTORY;
 
 /**
  * Default mode for new files. See drupal_chmod().
@@ -27,7 +26,7 @@
  * @deprecated in Drupal 8.0.x-dev, will be removed before Drupal 9.0.0.
  *   Use \Drupal\Core\File\FileSystem::CHMOD_FILE.
  */
-const FILE_CHMOD_FILE = FileSystem::CHMOD_FILE;
+    const FILE_CHMOD_FILE = FileSystem::CHMOD_FILE;
 
 /**
  * @defgroup file File interface
@@ -55,27 +54,27 @@
 /**
  * Flag used by file_prepare_directory() -- create directory if not present.
  */
-const FILE_CREATE_DIRECTORY = 1;
+    const FILE_CREATE_DIRECTORY = 1;
 
 /**
  * Flag used by file_prepare_directory() -- file permissions may be changed.
  */
-const FILE_MODIFY_PERMISSIONS = 2;
+    const FILE_MODIFY_PERMISSIONS = 2;
 
 /**
  * Flag for dealing with existing files: Appends number until name is unique.
  */
-const FILE_EXISTS_RENAME = 0;
+    const FILE_EXISTS_RENAME = 0;
 
 /**
  * Flag for dealing with existing files: Replace the existing file.
  */
-const FILE_EXISTS_REPLACE = 1;
+    const FILE_EXISTS_REPLACE = 1;
 
 /**
  * Flag for dealing with existing files: Do nothing and return FALSE.
  */
-const FILE_EXISTS_ERROR = 2;
+    const FILE_EXISTS_ERROR = 2;
 
 /**
  * Indicates that the file is permanent and should not be deleted.
@@ -85,7 +84,7 @@
  * runs, but permanent files will not be removed during the file garbage
  * collection process.
  */
-const FILE_STATUS_PERMANENT = 1;
+    const FILE_STATUS_PERMANENT = 1;
 
 /**
  * Returns the scheme of a URI (e.g. a stream).
@@ -107,7 +106,6 @@ function file_stream_wrapper_valid_scheme($scheme) {
   return \Drupal::service('file_system')->validScheme($scheme);
 }
 
-
 /**
  * Returns the part of a URI after the schema.
  *
@@ -269,7 +267,7 @@ function file_url_transform_relative($file_url) {
   $request = \Drupal::request();
   $host = $request->getHost();
   $scheme = $request->getScheme();
-  $port = $request->getPort() ?: 80;
+  $port = $request->getPort() ? : 80;
   if (('http' == $scheme && $port == 80) || ('https' == $scheme && $port == 443)) {
     $http_host = $host;
   }
@@ -290,11 +288,11 @@ function file_url_transform_relative($file_url) {
  *   A string reference containing the name of a directory path or URI. A
  *   trailing slash will be trimmed from a path.
  * @param $options
- *   A bitmask to indicate if the directory should be created if it does
- *   not exist (FILE_CREATE_DIRECTORY) or made writable if it is read-only
- *   (FILE_MODIFY_PERMISSIONS).
+ *   (optional) A bitmask to indicate if the directory should be created if it
+ *   does not exist (FILE_CREATE_DIRECTORY) or made writable if it is read-only
+ *   (FILE_MODIFY_PERMISSIONS).  Defaults to FILE_MODIFY_PERMISSIONS.
  *
- * @return
+ * @return bool
  *   TRUE if the directory exists (or was created) and is writable. FALSE
  *   otherwise.
  */
@@ -341,10 +339,10 @@ function file_ensure_htaccess() {
  * @param string $directory
  *   The directory.
  * @param bool $private
- *   (Optional) FALSE indicates that $directory should be a web-accessible
+ *   (optional) FALSE indicates that $directory should be a web-accessible
  *   directory. Defaults to TRUE which indicates a private directory.
  * @param bool $force_overwrite
- *   (Optional) Set to TRUE to attempt to overwrite the existing .htaccess file
+ *   (optional) Set to TRUE to attempt to overwrite the existing .htaccess file
  *   if one is already present. Defaults to FALSE.
  */
 function file_save_htaccess($directory, $private = TRUE, $force_overwrite = FALSE) {
@@ -377,7 +375,7 @@ function file_save_htaccess($directory, $private = TRUE, $force_overwrite = FALS
  * Returns the standard .htaccess lines that Drupal writes to file directories.
  *
  * @param bool $private
- *   (Optional) Set to FALSE to return the .htaccess lines for a web-accessible
+ *   (optional) Set to FALSE to return the .htaccess lines for a web-accessible
  *   public directory. The default is TRUE, which returns the .htaccess lines
  *   for a private directory that should not be web-accessible.
  *
@@ -429,20 +427,22 @@ function file_valid_uri($uri) {
  *   support streams if open_basedir is enabled. See
  *   https://bugs.php.net/bug.php?id=60456
  *
- * @param $source
+ * @param string $source
  *   A string specifying the filepath or URI of the source file.
- * @param $destination
- *   A URI containing the destination that $source should be copied to. The
- *   URI may be a bare filepath (without a scheme). If this value is omitted,
- *   Drupal's default files scheme will be used, usually "public://".
- * @param $replace
- *   Replace behavior when the destination file already exists:
+ * @param string|null $destination
+ *   (optional) A URI containing the destination that $source should be copied
+ *   to. The URI may be a bare filepath (without a scheme). If this value is
+ *   omitted, Drupal's default files scheme will be used, usually "public://".
+ *   Defaults to NULL.
+ * @param int $replace
+ *  - FILE_EXISTS_RENAME: (default) The replace behavior when the
+ *   destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
  *       unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
- * @return
+ * @return string|false
  *   The path to the new file, or FALSE in the event of an error.
  *
  * @see file_copy()
@@ -531,16 +531,16 @@ function file_build_uri($path) {
 /**
  * Determines the destination path for a file.
  *
- * @param $destination
+ * @param string $destination
  *   A string specifying the desired final URI or filepath.
- * @param $replace
+ * @param int $replace
  *   Replace behavior when the destination file already exists.
  *   - FILE_EXISTS_REPLACE - Replace the existing file.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
  *       unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
- * @return
+ * @return string|false
  *   The destination filepath, or FALSE if the file already exists
  *   and FILE_EXISTS_ERROR is specified.
  */
@@ -568,20 +568,21 @@ function file_destination($destination, $replace) {
 /**
  * Moves a file to a new location without database changes or hook invocation.
  *
- * @param $source
+ * @param string $source
  *   A string specifying the filepath or URI of the original file.
- * @param $destination
- *   A string containing the destination that $source should be moved to.
+ * @param string|null $destination
+ *   (optional) A string containing the destination that $source should be moved to.
  *   This must be a stream wrapper URI. If this value is omitted, Drupal's
- *   default files scheme will be used, usually "public://".
- * @param $replace
- *   Replace behavior when the destination file already exists:
+ *   default files scheme will be used, usually "public://". Defaults to NULL.
+ * @param int $replace
+ *   - FILE_EXISTS_RENAME: (default) The replace behavior when the
+ *   destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
  *       unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
- * @return
+ * @return string|false
  *   The URI of the moved file, or FALSE in the event of an error.
  *
  * @see file_move()
@@ -618,9 +619,9 @@ function file_unmanaged_move($source, $destination = NULL, $replace = FILE_EXIST
  *   File name to modify.
  * @param $extensions
  *   A space-separated list of extensions that should not be altered.
- * @param $alerts
- *   If TRUE, drupal_set_message() will be called to display a message if the
- *   file name was changed.
+ * @param bool $alerts
+ *   (optional) If TRUE, drupal_set_message() will be called to display a
+ *   message if the file name was changed. Defaults to TRUE.
  *
  * @return string
  *   The potentially modified $filename.
@@ -640,7 +641,6 @@ function file_munge_filename($filename, $extensions, $alerts = TRUE) {
     $filename_parts = explode('.', $filename);
     $new_filename = array_shift($filename_parts); // Remove file basename.
     $final_extension = array_pop($filename_parts); // Remove final extension.
-
     // Loop through the middle parts of the name and add an underscore to the
     // end of each section that could be a file extension but isn't in the list
     // of allowed extensions.
@@ -844,8 +844,6 @@ function file_unmanaged_delete_recursive($path, $callback = NULL) {
   return file_unmanaged_delete($path);
 }
 
-
-
 /**
  * Moves an uploaded file to a new location.
  *
@@ -863,21 +861,22 @@ function drupal_move_uploaded_file($filename, $uri) {
  * saved to the {file_managed} table and none of the file_* hooks will be
  * called.
  *
- * @param $data
+ * @param string $data
  *   A string containing the contents of the file.
- * @param $destination
- *   A string containing the destination location. This must be a stream wrapper
- *   URI. If no value is provided, a randomized name will be generated and the
- *   file will be saved using Drupal's default files scheme, usually
- *   "public://".
- * @param $replace
- *   Replace behavior when the destination file already exists:
+ * @param string|null $destination
+ *   (optional) A string containing the destination location. This must be a
+ *   stream wrapper URI. If no value is provided, a randomized name will be
+ *   generated and the file will be saved using Drupal's default files scheme,
+ *   usually "public://".  Defaults to NULL.
+ * @param int $replace
+ *   - FILE_EXISTS_RENAME:(default) The replace behavior when the
+ *   destination file already exists:
  *   - FILE_EXISTS_REPLACE - Replace the existing file.
  *   - FILE_EXISTS_RENAME - Append _{incrementing number} until the filename is
  *                          unique.
  *   - FILE_EXISTS_ERROR - Do nothing and return FALSE.
  *
- * @return
+ * @return string|false
  *   A string with the path of the resulting file, or FALSE on error.
  *
  * @see file_save_data()
diff --git a/core/includes/form.inc b/core/includes/form.inc
index a3d17a7..45efd2c 100644
--- a/core/includes/form.inc
+++ b/core/includes/form.inc
@@ -44,7 +44,7 @@ function template_preprocess_select(&$variables) {
  *
  * @param array $element
  *   An associative array containing the following key-value pairs:
- *   - #multiple: Optional Boolean indicating if the user may select more than
+ *   - #multiple: (optional) Boolean indicating if the user may select more than
  *     one item.
  *   - #options: An associative array of options to render as HTML. Each array
  *     value can be a string, an array, or an object with an 'option' property:
@@ -62,7 +62,7 @@ function template_preprocess_select(&$variables) {
  *       object with an 'option' property, the key is ignored, the contents of
  *       the option property are interpreted as $element['#options'], and the
  *       resulting HTML is added to the output.
- *   - #value: Optional integer, string, or array representing which option(s)
+ *   - #value: (optional) Integer, string, or array representing which option(s)
  *     to pre-select when the list is first displayed. The integer or string
  *     must match the key of an option in the '#options' list. If '#multiple' is
  *     TRUE, this can be an array of integers or strings.
@@ -76,7 +76,7 @@ function template_preprocess_select(&$variables) {
  *   select form element.
  *   - label: A translated string whose value is the text of a single HTML
  *     option element, or the label attribute for an optgroup.
- *   - options: Optional, array of options for an optgroup.
+ *   - options: (optional) An array of options for an optgroup.
  *   - selected: A boolean that indicates whether the option is selected when
  *     rendered.
  *   - type: A string that defines the element type. The value can be 'option'
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 62f2d6f..a7d1448 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -71,7 +71,7 @@
  * Gets the theme registry.
  *
  * @param bool $complete
- *   Optional boolean to indicate whether to return the complete theme registry
+ *   (optional) Boolean to indicate whether to return complete theme registry
  *   array or an instance of the Drupal\Core\Utility\ThemeRegistry class.
  *   If TRUE, the complete theme registry array will be returned. This is useful
  *   if you want to foreach over the whole registry, use array_* functions or
diff --git a/core/lib/Drupal/Core/Composer/Composer.php b/core/lib/Drupal/Core/Composer/Composer.php
index 0d5b6aa..ff1516d 100644
--- a/core/lib/Drupal/Core/Composer/Composer.php
+++ b/core/lib/Drupal/Core/Composer/Composer.php
@@ -142,7 +142,9 @@ public static function ensureHtaccess(Event $event) {
   /**
    * Remove possibly problematic test files from vendored projects.
    *
-   * @param \Composer\Script\Event $event
+   * @param \Composer\Installer\PackageEvent $event
+   * A PackageEvent object to get the current working directory for composer
+   * scripts to run.
    */
   public static function vendorTestCodeCleanup(PackageEvent $event) {
     $vendor_dir = $event->getComposer()->getConfig()->get('vendor-dir');
diff --git a/core/modules/block/templates/block.html.twig b/core/modules/block/templates/block.html.twig
index d880475..9ec3f4f 100644
--- a/core/modules/block/templates/block.html.twig
+++ b/core/modules/block/templates/block.html.twig
@@ -27,12 +27,14 @@
  * @ingroup themeable
  */
 #}
+
 <div{{ attributes }}>
   {{ title_prefix }}
   {% if label %}
     <h2{{ title_attributes }}>{{ label }}</h2>
   {% endif %}
   {{ title_suffix }}
+  {{ attach_library('libraries/mustache') }}
   {% block content %}
     {{ content }}
   {% endblock %}
diff --git a/core/modules/block_content/templates/block-content-add-list.html.twig b/core/modules/block_content/templates/block-content-add-list.html.twig
index 0810461..618201f 100644
--- a/core/modules/block_content/templates/block-content-add-list.html.twig
+++ b/core/modules/block_content/templates/block-content-add-list.html.twig
@@ -14,6 +14,7 @@
  * @ingroup themeable
  */
 #}
+{{dump(type)}}
 {% spaceless %}
   <dl>
     {% for type in types %}
diff --git a/core/modules/quickedit/js/views/EntityToolbarView.js b/core/modules/quickedit/js/views/EntityToolbarView.js
index 4e8e913..d7adea4 100644
--- a/core/modules/quickedit/js/views/EntityToolbarView.js
+++ b/core/modules/quickedit/js/views/EntityToolbarView.js
@@ -24,6 +24,7 @@
         'click button.action-cancel': 'onClickCancel',
         'mouseenter': 'onMouseenter'
       };
+      console.log
       return map;
     },
 
@@ -123,6 +124,7 @@
             .addClass('action-saving icon-throbber icon-end')
             .text(Drupal.t('Saving'))
             .attr('disabled', 'disabled');
+    location.reload();
           break;
 
         default:
@@ -359,6 +361,7 @@
       event.preventDefault();
       // Save the model.
       this.model.set('state', 'committing');
+      
     },
 
     /**
diff --git a/core/themes/bartik/bartik.libraries.yml b/core/themes/bartik/bartik.libraries.yml
index fd82367..2a03796 100644
--- a/core/themes/bartik/bartik.libraries.yml
+++ b/core/themes/bartik/bartik.libraries.yml
@@ -59,6 +59,9 @@ global-styling:
     theme:
       css/colors.css: {}
       css/print.css: { media: print }
+      css/node_view.css: {}
+  js:
+    js/main.js: {}
 
 messages:
   version: VERSION
diff --git a/core/themes/bartik/bartik.theme b/core/themes/bartik/bartik.theme
index 3d3ca12..be02417 100644
--- a/core/themes/bartik/bartik.theme
+++ b/core/themes/bartik/bartik.theme
@@ -4,15 +4,19 @@
  * @file
  * Functions to support theming in the Bartik theme.
  */
-
 use Drupal\Core\Template\Attribute;
 
+
 /**
  * Implements hook_preprocess_HOOK() for HTML document templates.
  *
  * Adds body classes if certain regions have content.
  */
 function bartik_preprocess_html(&$variables) {
+  //$variables['node'] = $variables['elements']['#node'];
+  /** @var \Drupal\node\NodeInterface $node */
+  //$node = $variables['node'];
+  //print "<pre>";print_r($node); die;
   // Add information about the number of sidebars.
   if (!empty($variables['page']['sidebar_first']) && !empty($variables['page']['sidebar_second'])) {
     $variables['attributes']['class'][] = 'layout-two-sidebars';
@@ -32,7 +36,6 @@ function bartik_preprocess_html(&$variables) {
   if (!empty($variables['page']['featured_top'])) {
     $variables['attributes']['class'][] = 'has-featured-top';
   }
-
 }
 
 /**
diff --git a/modules/custom/mustache_engine/quickedit.libraries.yml b/modules/custom/mustache_engine/quickedit.libraries.yml
index 7c81563..c92ee41 100644
--- a/modules/custom/mustache_engine/quickedit.libraries.yml
+++ b/modules/custom/mustache_engine/quickedit.libraries.yml
@@ -1,56 +1,6 @@
-quickedit:
+mustache_engine:
   version: VERSION
   js:
-    # Core.
-    js/quickedit.js: {}
-    js/util.js: {}
-    # Models.
-    js/models/BaseModel.js: {}
-    js/models/AppModel.js: {}
-    js/models/EntityModel.js: {}
-    js/models/FieldModel.js: {}
-    js/models/EditorModel.js: {}
-    # Views.
-    js/views/AppView.js: {}
-    js/views/FieldDecorationView.js: {}
-    js/views/EntityDecorationView.js: {}
-    js/views/EntityToolbarView.js: {}
-    js/views/ContextualLinkView.js: {}
-    js/views/FieldToolbarView.js: {}
-    js/views/EditorView.js: {}
     # Other.
     js/theme.js: {}
-  css:
-    component:
-      css/quickedit.module.css: {}
-    theme:
-      css/quickedit.theme.css: {}
-      css/quickedit.icons.theme.css: {}
-  dependencies:
-    - core/jquery
-    - core/jquery.once
-    - core/underscore
-    - core/backbone
-    - core/jquery.form
-    - core/jquery.ui.position
-    - core/drupal
-    - core/drupal.displace
-    - core/drupal.form
-    - core/drupal.ajax
-    - core/drupal.debounce
-    - core/drupalSettings
-    - core/drupal.dialog
-
-quickedit.inPlaceEditor.form:
-  version: VERSION
-  js:
-    js/editors/formEditor.js: {}
-  dependencies:
-    - quickedit/quickedit
-
-quickedit.inPlaceEditor.plainText:
-  version: VERSION
-  js:
-    js/editors/plainTextEditor.js: {}
-  dependencies:
-    - quickedit/quickedit
+  
\ No newline at end of file
diff --git a/sites/default/default.services.yml b/sites/default/default.services.yml
index 23f6483..a13f75e 100644
--- a/sites/default/default.services.yml
+++ b/sites/default/default.services.yml
@@ -55,7 +55,7 @@ parameters:
     #
     # Not recommended in production environments
     # @default false
-    debug: false
+    debug: true
     # Twig auto-reload:
     #
     # Automatically recompile Twig templates whenever the source code changes.
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 5e1469e..990cfdc 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -13,9 +13,7 @@
 namespace Composer\Autoload;
 
 /**
- * ClassLoader implements a PSR-0 class loader
- *
- * See https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
  *
  *     $loader = new \Composer\Autoload\ClassLoader();
  *
@@ -39,6 +37,8 @@
  *
  * @author Fabien Potencier <fabien@symfony.com>
  * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
  */
 class ClassLoader
 {
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
index 52711f4..0e9136e 100644
--- a/vendor/composer/autoload_files.php
+++ b/vendor/composer/autoload_files.php
@@ -6,8 +6,8 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
-    $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
-    $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
-    $baseDir . '/core/lib/Drupal.php',
+    'c964ee0ededf28c96ebd9db5099ef910' => $vendorDir . '/guzzlehttp/promises/src/functions_include.php',
+    'a0edc8309cc5e1d60e3047b5df6b7052' => $vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
+    '37a3dc5111fe8f707ab4c132ef1dbc62' => $vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
+    '454414594637b9dd94a19af83f56f1a2' => $baseDir . '/core/lib/Drupal.php',
 );
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index bb43043..9b35039 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -12,6 +12,8 @@
     'Stack' => array($vendorDir . '/stack/builder/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log'),
     'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
+    'Mustache' => array($vendorDir . '/mustache/mustache/src'),
+    'Handlebars' => array($vendorDir . '/xamin/handlebars.php/src'),
     'Egulias\\' => array($vendorDir . '/egulias/email-validator/src'),
     'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
     'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 4bd9987..4303fce 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -41,15 +41,19 @@ public static function getLoader()
         $loader->register(true);
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
-        foreach ($includeFiles as $file) {
-            composerRequireDrupal8($file);
+        foreach ($includeFiles as $fileIdentifier => $file) {
+            composerRequireDrupal8($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequireDrupal8($file)
+function composerRequireDrupal8($fileIdentifier, $file)
 {
-    require $file;
+    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
+        require $file;
+
+        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+    }
 }
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index b58ef9a..c3ad2d9 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2746,7 +2746,7 @@
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/10d7c48c9a4129463052321b52450d98983c4332",
+            "url": "https://api.github.com/repos/jcalderonzumba/MinkPhantomJSDriver/zipball/5bf53fa36afb7e2f378905c6f118527cefe205ad",
             "reference": "10d7c48c9a4129463052321b52450d98983c4332",
             "shasum": ""
         },
@@ -3857,5 +3857,97 @@
             }
         ],
         "description": "Composer plugin to merge multiple composer.json files"
+    },
+    {
+        "name": "mustache/mustache",
+        "version": "v2.9.0",
+        "version_normalized": "2.9.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/bobthecow/mustache.php.git",
+            "reference": "c745b01956caf27d26b55a72a90aff56bc169cd6"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/c745b01956caf27d26b55a72a90aff56bc169cd6",
+            "reference": "c745b01956caf27d26b55a72a90aff56bc169cd6",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.2.4"
+        },
+        "require-dev": {
+            "fabpot/php-cs-fixer": "~1.6",
+            "phpunit/phpunit": "~3.7|~4.0"
+        },
+        "time": "2015-08-15 19:23:13",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Mustache": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Justin Hileman",
+                "email": "justin@justinhileman.info",
+                "homepage": "http://justinhileman.com"
+            }
+        ],
+        "description": "A Mustache implementation in PHP.",
+        "homepage": "https://github.com/bobthecow/mustache.php",
+        "keywords": [
+            "mustache",
+            "templating"
+        ]
+    },
+    {
+        "name": "xamin/handlebars.php",
+        "version": "v0.10.3",
+        "version_normalized": "0.10.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/XaminProject/handlebars.php.git",
+            "reference": "5e1db1d1c7969fae32eab331a3b4d9b93257a709"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/XaminProject/handlebars.php/zipball/5e1db1d1c7969fae32eab331a3b4d9b93257a709",
+            "reference": "5e1db1d1c7969fae32eab331a3b4d9b93257a709",
+            "shasum": ""
+        },
+        "require-dev": {
+            "phpunit/phpunit": "~4.4",
+            "squizlabs/php_codesniffer": "~1.5"
+        },
+        "time": "2015-08-06 22:16:36",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Handlebars": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "fzerorubigd",
+                "email": "fzerorubigd@gmail.com"
+            },
+            {
+                "name": "Behrooz Shabani (everplays)",
+                "email": "everplays@gmail.com"
+            }
+        ],
+        "description": "Handlebars processor for php",
+        "homepage": "https://github.com/XaminProject/handlebars.php"
     }
 ]