From 63f75c7ebacf8b9f8e508f2e3e6ce660078897d4 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Thu, 8 Jan 2015 17:59:29 +0100
Subject: [PATCH] move some js libs to a standard distribution

---
 server/sonar-web/.jshintrc                    |    1 +
 server/sonar-web/Gruntfile.coffee             |   13 +-
 server/sonar-web/package.json                 |    2 +-
 .../main/coffee/analysis-reports/app.coffee   |   19 -
 .../coffee/analysis-reports/layout.coffee     |    7 +-
 .../analysis-reports/models/report.coffee     |    2 +-
 .../analysis-reports/models/reports.coffee    |    2 -
 .../coffee/analysis-reports/router.coffee     |    6 +-
 .../views/actions-view.coffee                 |    6 +-
 .../analysis-reports/views/report-view.coffee |    6 +-
 .../views/reports-empty-view.coffee           |    6 +-
 .../views/reports-view.coffee                 |    2 -
 .../main/coffee/api-documentation/app.coffee  |   24 +-
 .../collections/web-service-actions.coffee    |    2 -
 .../collections/web-services.coffee           |    2 -
 .../coffee/api-documentation/layout.coffee    |    6 +-
 .../models/web-service-action-response.coffee |    6 +-
 .../models/web-service-action.coffee          |    6 +-
 .../models/web-service.coffee                 |    6 +-
 .../coffee/api-documentation/router.coffee    |    2 -
 ...-documentation-action-response-view.coffee |    6 +-
 .../api-documentation-action-view.coffee      |    7 +-
 ...api-documentation-actions-list-view.coffee |    7 +-
 .../views/api-documentation-list-view.coffee  |    2 -
 .../api-documentation-web-service-view.coffee |    5 +-
 .../src/main/coffee/common/popup.coffee       |    6 +-
 .../src/main/coffee/dashboard/app.coffee      |   17 -
 .../dashboard/collections/widgets.coffee      |    2 -
 .../coffee/dashboard/models/widget.coffee     |    2 +-
 .../coffee/dashboard/views/widget-view.coffee |    2 -
 .../dashboard/views/widgets-view.coffee       |    2 -
 .../src/main/coffee/design/app.coffee         |   17 -
 .../src/main/coffee/design/info-view.coffee   |    6 +-
 .../src/main/coffee/design/view.coffee        |    3 -
 .../issue/collections/action-plans.coffee     |    8 +-
 .../coffee/issue/collections/issues.coffee    |    2 -
 .../src/main/coffee/issue/issue-view.coffee   |    8 +-
 .../coffee/issue/manual-issue-view.coffee     |    6 +-
 .../main/coffee/issue/models/changelog.coffee |    8 +-
 .../src/main/coffee/issue/models/issue.coffee |    6 +-
 .../issue/views/assign-form-view.coffee       |    3 +-
 .../coffee/issue/views/changelog-view.coffee  |    3 +-
 .../issue/views/comment-form-view.coffee      |    3 +-
 .../issue/views/more-actions-view.coffee      |    3 +-
 .../coffee/issue/views/plan-form-view.coffee  |    3 +-
 .../coffee/issue/views/rule-overlay.coffee    |    1 -
 .../issue/views/set-severity-form-view.coffee |    3 +-
 .../src/main/coffee/issues/app-new.coffee     |   20 -
 .../issues/component-viewer/main.coffee       |    7 +-
 .../issues/facets/action-plan-facet.coffee    |    1 -
 .../issues/facets/assignee-facet.coffee       |    1 -
 .../coffee/issues/facets/base-facet.coffee    |    1 -
 .../issues/facets/component-facet.coffee      |    1 -
 .../issues/facets/creation-date-facet.coffee  |    1 -
 .../issues/facets/custom-values-facet.coffee  |    1 -
 .../issues/facets/issue-key-facet.coffee      |    1 -
 .../issues/facets/resolution-facet.coffee     |    1 -
 .../issues/facets/severity-facet.coffee       |    1 -
 .../coffee/issues/facets/status-facet.coffee  |    1 -
 .../main/coffee/issues/filters-view.coffee    |    6 +-
 .../src/main/coffee/issues/help-view.coffee   |   16 -
 .../src/main/coffee/issues/layout.coffee      |    6 +-
 .../main/coffee/issues/models/facet.coffee    |    6 +-
 .../main/coffee/issues/models/facets.coffee   |    2 -
 .../main/coffee/issues/models/filter.coffee   |    6 +-
 .../main/coffee/issues/models/filters.coffee  |    2 -
 .../main/coffee/issues/models/issues.coffee   |    2 -
 .../issues/workspace-header-view.coffee       |    1 -
 .../issues/workspace-list-empty-view.coffee   |    6 +-
 .../coffee/issues/workspace-list-view.coffee  |    3 +-
 .../src/main/coffee/libraries/app.coffee      |   17 -
 .../src/main/coffee/libraries/view.coffee     |    6 +-
 .../src/main/coffee/quality-gate/app.coffee   |   26 +-
 .../collections/conditions.coffee             |    2 -
 .../collections/quality-gates.coffee          |    2 -
 .../main/coffee/quality-gate/layout.coffee    |    8 +-
 .../quality-gate/models/condition.coffee      |    6 +-
 .../quality-gate/models/quality-gate.coffee   |    6 +-
 .../main/coffee/quality-gate/router.coffee    |    2 -
 .../views/quality-gate-actions-view.coffee    |    5 +-
 .../quality-gate-detail-condition-view.coffee |    6 +-
 ...y-gate-detail-conditions-empty-view.coffee |    6 +-
 ...quality-gate-detail-conditions-view.coffee |    5 +-
 .../quality-gate-detail-header-view.coffee    |    5 +-
 .../quality-gate-detail-projects-view.coffee  |    8 +-
 .../views/quality-gate-detail-view.coffee     |    5 +-
 .../views/quality-gate-edit-view.coffee       |    6 +-
 ...uality-gate-sidebar-list-empty-view.coffee |    6 +-
 ...quality-gate-sidebar-list-item-view.coffee |    6 +-
 .../quality-gate-sidebar-list-view.coffee     |    2 -
 .../hbs/navigator/choice-filter-template.hbs  |    0
 .../sonar-web/src/main/js/coding-rules/app.js |   32 +-
 .../js/coding-rules/bulk-change-modal-view.js |    2 +-
 .../js/coding-rules/bulk-change-popup-view.js |    6 +-
 .../facets/active-severity-facet.js           |    2 +-
 .../facets/available-since-facet.js           |    2 +-
 .../main/js/coding-rules/facets/base-facet.js |    2 +-
 .../facets/quality-profile-facet.js           |    2 +-
 .../js/coding-rules/facets/query-facet.js     |    2 +-
 .../js/coding-rules/facets/severity-facet.js  |    2 +-
 .../js/coding-rules/facets/template-facet.js  |    2 +-
 .../src/main/js/coding-rules/filters-view.js  |    7 +-
 .../src/main/js/coding-rules/layout.js        |    3 +-
 .../src/main/js/coding-rules/models/rule.js   |    4 +-
 .../src/main/js/coding-rules/models/rules.js  |    3 +-
 .../main/js/coding-rules/rule-details-view.js |   27 +-
 .../rule/custom-rule-creation-view.js         |    2 +-
 .../js/coding-rules/rule/custom-rule-view.js  |    3 +-
 .../js/coding-rules/rule/custom-rules-view.js |    7 +-
 .../rule/manual-rule-creation-view.js         |    2 +-
 .../rule/profile-activation-view.js           |    2 +-
 .../rule/rule-description-view.js             |    3 +-
 .../js/coding-rules/rule/rule-issues-view.js  |    3 +-
 .../js/coding-rules/rule/rule-meta-view.js    |    3 +-
 .../coding-rules/rule/rule-parameters-view.js |    3 +-
 .../js/coding-rules/rule/rule-profile-view.js |    7 +-
 .../coding-rules/rule/rule-profiles-view.js   |    7 +-
 .../src/main/js/coding-rules/show-app.js      |   32 +-
 .../js/coding-rules/workspace-header-view.js  |    6 +-
 .../coding-rules/workspace-list-empty-view.js |    4 +-
 .../coding-rules/workspace-list-item-view.js  |    2 +-
 .../js/coding-rules/workspace-list-view.js    |    6 +-
 .../main/js/common/handlebars-extensions.js   |   34 +-
 server/sonar-web/src/main/js/common/modals.js |    2 +-
 .../src/main/js/common/select-list.js         |   15 +-
 .../js/components/navigator/controller.js     |    4 +-
 .../js/components/navigator/facets-view.js    |    3 +-
 .../components/navigator/facets/base-facet.js |    4 +-
 .../js/components/navigator/models/facet.js   |    4 +-
 .../js/components/navigator/models/facets.js  |    3 +-
 .../js/components/navigator/models/state.js   |    4 +-
 .../main/js/components/navigator/router.js    |    4 +-
 .../navigator/workspace-header-view.js        |    4 +-
 .../navigator/workspace-list-item-view.js     |    4 +-
 .../navigator/workspace-list-view.js          |    4 +-
 server/sonar-web/src/main/js/drilldown/app.js |   22 +-
 server/sonar-web/src/main/js/measures/app.js  |   25 +-
 .../main/js/measures/measures-filter-bar.js   |    6 +-
 .../navigator/filters/action-plan-filters.js  |    3 +-
 .../navigator/filters/ajax-select-filters.js  |    8 +-
 .../main/js/navigator/filters/base-filters.js |    7 +-
 .../js/navigator/filters/checkbox-filters.js  |    7 +-
 .../js/navigator/filters/choice-filters.js    |    6 +-
 .../js/navigator/filters/context-filters.js   |    2 +-
 .../js/navigator/filters/favorite-filters.js  |    7 +-
 .../main/js/navigator/filters/filter-bar.js   |    6 +-
 .../js/navigator/filters/metric-filters.js    |    5 +-
 .../filters/more-criteria-filters.js          |    5 +-
 .../js/navigator/filters/range-filters.js     |    5 +-
 .../js/navigator/filters/read-only-filters.js |    2 +-
 .../main/js/navigator/filters/rule-filters.js |    3 +-
 .../js/navigator/filters/string-filters.js    |    5 +-
 .../src/main/js/source-viewer/app.js          |   22 +-
 .../src/main/js/source-viewer/header.js       |    7 +-
 .../main/js/source-viewer/measures-overlay.js |    2 +-
 .../src/main/js/source-viewer/more-actions.js |    3 +-
 .../js/source-viewer/popups/coverage-popup.js |    7 +-
 .../source-viewer/popups/duplication-popup.js |    7 +-
 .../popups/line-actions-popup.js              |    7 +-
 .../main/js/source-viewer/popups/scm-popup.js |    7 +-
 .../src/main/js/source-viewer/source.js       |    4 +-
 .../src/main/js/source-viewer/viewer.js       |   10 +-
 .../src/main/js/third-party/handlebars.js     | 2974 +++--------------
 163 files changed, 721 insertions(+), 3227 deletions(-)
 create mode 100644 server/sonar-web/src/main/hbs/navigator/choice-filter-template.hbs

diff --git a/server/sonar-web/.jshintrc b/server/sonar-web/.jshintrc
index 1b20cb8552a..2d6820a4d4c 100644
--- a/server/sonar-web/.jshintrc
+++ b/server/sonar-web/.jshintrc
@@ -82,6 +82,7 @@
     "baseUrl": true,
     "key": true,
     "Backbone": true,
+    "Handlebars": true,
     "t": true,
     "tp": true,
     "moment": true,
diff --git a/server/sonar-web/Gruntfile.coffee b/server/sonar-web/Gruntfile.coffee
index 600c5680e70..60b9b6b3e87 100644
--- a/server/sonar-web/Gruntfile.coffee
+++ b/server/sonar-web/Gruntfile.coffee
@@ -81,6 +81,10 @@ module.exports = (grunt) ->
             '<%= pkg.assets %>js/third-party/d3.js'
             '<%= pkg.assets %>js/third-party/latinize.js'
             '<%= pkg.assets %>js/third-party/underscore.js'
+            '<%= pkg.assets %>js/third-party/backbone.js'
+            '<%= pkg.assets %>js/third-party/backbone.marionette.js'
+            '<%= pkg.assets %>js/third-party/handlebars.js'
+            '<%= pkg.assets %>js/third-party/underscore.js'
             '<%= pkg.assets %>js/third-party/select2.js'
             '<%= pkg.assets %>js/third-party/keymaster.js'
             '<%= pkg.assets %>js/third-party/moment.js'
@@ -105,6 +109,7 @@ module.exports = (grunt) ->
             '<%= pkg.assets %>js/common/dialogs.js'
             '<%= pkg.assets %>js/common/processes.js'
             '<%= pkg.assets %>js/common/jquery-isolated-scroll.js'
+            '<%= pkg.assets %>js/common/handlebars-extensions.js'
             '<%= pkg.assets %>js/application.js'
             '<%= pkg.assets %>js/csv.js'
             '<%= pkg.assets %>js/dashboard.js'
@@ -119,6 +124,10 @@ module.exports = (grunt) ->
             '<%= pkg.assets %>js/third-party/d3.js'
             '<%= pkg.assets %>js/third-party/latinize.js'
             '<%= pkg.assets %>js/third-party/underscore.js'
+            '<%= pkg.assets %>js/third-party/backbone.js'
+            '<%= pkg.assets %>js/third-party/backbone.marionette.js'
+            '<%= pkg.assets %>js/third-party/handlebars.js'
+            '<%= pkg.assets %>js/third-party/underscore.js'
             '<%= pkg.assets %>js/third-party/select2.js'
             '<%= pkg.assets %>js/third-party/keymaster.js'
             '<%= pkg.assets %>js/third-party/moment.js'
@@ -143,6 +152,7 @@ module.exports = (grunt) ->
             '<%= pkg.assets %>js/common/dialogs.js'
             '<%= pkg.assets %>js/common/processes.js'
             '<%= pkg.assets %>js/common/jquery-isolated-scroll.js'
+            '<%= pkg.assets %>js/common/handlebars-extensions.js'
             '<%= pkg.assets %>js/application.js'
             '<%= pkg.assets %>js/csv.js'
             '<%= pkg.assets %>js/dashboard.js'
@@ -228,8 +238,7 @@ module.exports = (grunt) ->
 
     handlebars:
       options:
-        amd: true
-        namespace: 'SS.Templates'
+        namespace: 'Templates'
         processName: (name) ->
           pieces = name.split '/'
           fileName = pieces[pieces.length - 1]
diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json
index 0971f5d2942..f536c7f9899 100644
--- a/server/sonar-web/package.json
+++ b/server/sonar-web/package.json
@@ -12,7 +12,7 @@
     "grunt-contrib-coffee": "0.10.1",
     "grunt-contrib-concat": "0.4.0",
     "grunt-contrib-copy": "0.5.0",
-    "grunt-contrib-handlebars": "0.7.0",
+    "grunt-contrib-handlebars": "0.9.2",
     "grunt-contrib-jshint": "0.10.0",
     "grunt-contrib-less": "0.10.0",
     "grunt-contrib-requirejs": "0.4.3",
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/app.coffee b/server/sonar-web/src/main/coffee/analysis-reports/app.coffee
index 80b07c5f073..308a8e8ba3a 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/app.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/app.coffee
@@ -1,33 +1,14 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-
 
 requirejs [
-  'backbone', 'backbone.marionette'
-
   'analysis-reports/router'
   'analysis-reports/layout'
   'analysis-reports/models/reports'
   'analysis-reports/views/reports-view'
   'analysis-reports/views/actions-view'
-
-  'common/handlebars-extensions'
 ], (
-  Backbone, Marionette
   Router
   Layout
   Reports
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/layout.coffee b/server/sonar-web/src/main/coffee/analysis-reports/layout.coffee
index 76bdd1068d0..a24863ff08c 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/layout.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/layout.coffee
@@ -1,15 +1,12 @@
 define [
-  'backbone.marionette',
   'templates/analysis-reports'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class extends Marionette.Layout
     template: Templates['analysis-reports-layout']
 
 
+
     regions:
       actionsRegion: '.analysis-reports-actions'
       resultsRegion: '.analysis-reports-results'
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/models/report.coffee b/server/sonar-web/src/main/coffee/analysis-reports/models/report.coffee
index ba69b108ac4..77f4f88aaa9 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/models/report.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/models/report.coffee
@@ -1,4 +1,4 @@
-define ['backbone'], (Backbone) ->
+define ->
 
 
   class extends Backbone.Model
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/models/reports.coffee b/server/sonar-web/src/main/coffee/analysis-reports/models/reports.coffee
index bff33c97932..6d67a739375 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/models/reports.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/models/reports.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone'
   'analysis-reports/models/report'
 ], (
-  Backbone
   Report
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/router.coffee b/server/sonar-web/src/main/coffee/analysis-reports/router.coffee
index db11154c188..5195ec747b5 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/router.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/router.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone',
-], (
-  Backbone,
-) ->
+define ->
 
   class AppRouter extends Backbone.Router
 
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee b/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee
index 12608b30d87..10c6a7a6971 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/views/actions-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/analysis-reports'
-], (
-  Marionette
-  Templates
-) ->
+], ->
 
   class extends Marionette.ItemView
     template: Templates['analysis-reports-actions']
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee b/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee
index 25b2680bf29..ad94e17cc46 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/views/report-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/analysis-reports'
-], (
-  Marionette
-  Templates
-) ->
+], ->
 
   class extends Marionette.ItemView
     tagName: 'li'
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/views/reports-empty-view.coffee b/server/sonar-web/src/main/coffee/analysis-reports/views/reports-empty-view.coffee
index 11ff49aeff5..4fc7823bb86 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/views/reports-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/views/reports-empty-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/analysis-reports'
-], (
-  Marionette
-  Templates
-) ->
+], ->
 
   class extends Marionette.ItemView
     className: 'analysis-reports-no-results'
diff --git a/server/sonar-web/src/main/coffee/analysis-reports/views/reports-view.coffee b/server/sonar-web/src/main/coffee/analysis-reports/views/reports-view.coffee
index b75d8f8d9ef..7cbf799e5ea 100644
--- a/server/sonar-web/src/main/coffee/analysis-reports/views/reports-view.coffee
+++ b/server/sonar-web/src/main/coffee/analysis-reports/views/reports-view.coffee
@@ -1,9 +1,7 @@
 define [
-  'backbone.marionette'
   'analysis-reports/views/report-view'
   'analysis-reports/views/reports-empty-view'
 ], (
-  Marionette
   ReportView
   EmptyView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/api-documentation/app.coffee b/server/sonar-web/src/main/coffee/api-documentation/app.coffee
index 1fe33d8a18a..9672844a4f4 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/app.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/app.coffee
@@ -1,34 +1,12 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'jquery': 'third-party/jquery'
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-    'moment': 'third-party/moment'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-    'moment':
-      exports: 'moment'
-
-
 requirejs [
-  'backbone', 'backbone.marionette', 'handlebars',
   'api-documentation/collections/web-services',
   'api-documentation/views/api-documentation-list-view',
   'api-documentation/router',
-  'api-documentation/layout',
-  'common/handlebars-extensions'
+  'api-documentation/layout'
 ], (
-  Backbone, Marionette, Handlebars,
   WebServices,
   ApiDocumentationListView,
   ApiDocumentationRouter,
diff --git a/server/sonar-web/src/main/coffee/api-documentation/collections/web-service-actions.coffee b/server/sonar-web/src/main/coffee/api-documentation/collections/web-service-actions.coffee
index 955ae184a39..f8935e532ed 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/collections/web-service-actions.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/collections/web-service-actions.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone',
   'api-documentation/models/web-service-action'
 ], (
-  Backbone,
   WebServiceAction
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/api-documentation/collections/web-services.coffee b/server/sonar-web/src/main/coffee/api-documentation/collections/web-services.coffee
index 5e2c9ab78f2..3978917dc7c 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/collections/web-services.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/collections/web-services.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone',
   'api-documentation/models/web-service'
 ], (
-  Backbone,
   WebService
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/api-documentation/layout.coffee b/server/sonar-web/src/main/coffee/api-documentation/layout.coffee
index 72ecacf7bed..8113ff822d6 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/layout.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/layout.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/api-documentation'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class AppLayout extends Marionette.Layout
     className: 'navigator api-documentation-navigator'
diff --git a/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action-response.coffee b/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action-response.coffee
index 03a5f48e66f..c973ecc0320 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action-response.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action-response.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class WebServiceActionResponse extends Backbone.Model
 
diff --git a/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action.coffee b/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action.coffee
index 9b4bf6e5983..bd2e217cc91 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/models/web-service-action.coffee
@@ -1,7 +1,3 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class WebServiceAction extends Backbone.Model
diff --git a/server/sonar-web/src/main/coffee/api-documentation/models/web-service.coffee b/server/sonar-web/src/main/coffee/api-documentation/models/web-service.coffee
index 6555dc08dad..d06631a1df4 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/models/web-service.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/models/web-service.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class WebService extends Backbone.Model
     idAttribute: 'path'
diff --git a/server/sonar-web/src/main/coffee/api-documentation/router.coffee b/server/sonar-web/src/main/coffee/api-documentation/router.coffee
index 14a0cfc8b98..56553301c52 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/router.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/router.coffee
@@ -1,9 +1,7 @@
 define [
-  'backbone',
   'api-documentation/collections/web-service-actions',
   'api-documentation/views/api-documentation-actions-list-view',
 ], (
-  Backbone,
   WebServiceActions,
   ApiDocumentationActionsListView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee
index e4ae7498939..ddf658ff94f 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-response-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/api-documentation'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class ApiDocumentationActionResponseView extends Marionette.ItemView
     tagName: 'div'
diff --git a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee
index 0920cae53ae..b5b01481408 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-action-view.coffee
@@ -1,11 +1,8 @@
 define [
-  'backbone.marionette',
-  'templates/api-documentation',
-  'api-documentation/models/web-service-action-response',
+  'api-documentation/models/web-service-action-response'
   'api-documentation/views/api-documentation-action-response-view'
+  'templates/api-documentation'
 ], (
-  Marionette,
-  Templates,
   WebServiceActionResponse,
   ApiDocumentationActionResponseView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee
index 1713f9be01e..0ea6e6c58f8 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-actions-list-view.coffee
@@ -1,11 +1,8 @@
 define [
-  'backbone.marionette',
-  'templates/api-documentation'
-  'api-documentation/models/web-service-action',
+  'api-documentation/models/web-service-action'
   'api-documentation/views/api-documentation-action-view'
+  'templates/api-documentation'
 ], (
-  Marionette,
-  Templates
   WebServiceAction,
   ApiDocumentationActionView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee
index 406c5d38eb5..920dae02ddd 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-list-view.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone.marionette',
   'api-documentation/views/api-documentation-web-service-view'
 ], (
-  Marionette,
   ApiDocumentationWebServiceView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee
index 2e377d15000..e82b95360f7 100644
--- a/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee
+++ b/server/sonar-web/src/main/coffee/api-documentation/views/api-documentation-web-service-view.coffee
@@ -1,11 +1,8 @@
 define [
-  'backbone.marionette',
-  'templates/api-documentation',
   'api-documentation/collections/web-service-actions'
   'api-documentation/views/api-documentation-actions-list-view'
+  'templates/api-documentation'
 ], (
-  Marionette,
-  Templates,
   WebServiceActions,
   ApiDocumentationActionsListView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/common/popup.coffee b/server/sonar-web/src/main/coffee/common/popup.coffee
index 90af92a4a5b..6b2f829a431 100644
--- a/server/sonar-web/src/main/coffee/common/popup.coffee
+++ b/server/sonar-web/src/main/coffee/common/popup.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone.marionette'
-], (
-  Marionette
-) ->
+define ->
 
   $ = jQuery
 
diff --git a/server/sonar-web/src/main/coffee/dashboard/app.coffee b/server/sonar-web/src/main/coffee/dashboard/app.coffee
index cac23d15268..829946c9161 100644
--- a/server/sonar-web/src/main/coffee/dashboard/app.coffee
+++ b/server/sonar-web/src/main/coffee/dashboard/app.coffee
@@ -1,29 +1,12 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-
 
 requirejs [
-  'backbone.marionette'
   'dashboard/collections/widgets'
   'dashboard/views/widgets-view'
   'dashboard/mockjax'
-  'common/handlebars-extensions'
 ], (
-  Marionette
   Widgets
   WidgetsView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/dashboard/collections/widgets.coffee b/server/sonar-web/src/main/coffee/dashboard/collections/widgets.coffee
index da60c3e7d0d..5c2cee6d059 100644
--- a/server/sonar-web/src/main/coffee/dashboard/collections/widgets.coffee
+++ b/server/sonar-web/src/main/coffee/dashboard/collections/widgets.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone'
   'dashboard/models/widget'
 ], (
-  Backbone
   Widget
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/dashboard/models/widget.coffee b/server/sonar-web/src/main/coffee/dashboard/models/widget.coffee
index 07b3531fac7..7b6269c70af 100644
--- a/server/sonar-web/src/main/coffee/dashboard/models/widget.coffee
+++ b/server/sonar-web/src/main/coffee/dashboard/models/widget.coffee
@@ -1,4 +1,4 @@
-define ['backbone'], (Backbone) ->
+define ->
 
 
   class extends Backbone.Model
diff --git a/server/sonar-web/src/main/coffee/dashboard/views/widget-view.coffee b/server/sonar-web/src/main/coffee/dashboard/views/widget-view.coffee
index e3ca38226ba..a044b09b536 100644
--- a/server/sonar-web/src/main/coffee/dashboard/views/widget-view.coffee
+++ b/server/sonar-web/src/main/coffee/dashboard/views/widget-view.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/dashboard'
 ], (
-  Marionette
   Templates
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/dashboard/views/widgets-view.coffee b/server/sonar-web/src/main/coffee/dashboard/views/widgets-view.coffee
index b23dd061c63..787422d361e 100644
--- a/server/sonar-web/src/main/coffee/dashboard/views/widgets-view.coffee
+++ b/server/sonar-web/src/main/coffee/dashboard/views/widgets-view.coffee
@@ -1,10 +1,8 @@
 define [
-  'backbone.marionette'
   'templates/dashboard'
   'dashboard/models/widget'
   'dashboard/views/widget-view'
 ], (
-  Marionette
   Templates
   Widget
   WidgetView
diff --git a/server/sonar-web/src/main/coffee/design/app.coffee b/server/sonar-web/src/main/coffee/design/app.coffee
index 46bedf28096..349563bf6a4 100644
--- a/server/sonar-web/src/main/coffee/design/app.coffee
+++ b/server/sonar-web/src/main/coffee/design/app.coffee
@@ -1,27 +1,10 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-
 
 requirejs [
-  'backbone', 'backbone.marionette'
   'design/view'
-  'common/handlebars-extensions'
 ], (
-  Backbone, Marionette
   DesignView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/design/info-view.coffee b/server/sonar-web/src/main/coffee/design/info-view.coffee
index 51b3c7c0c46..83aca1e246b 100644
--- a/server/sonar-web/src/main/coffee/design/info-view.coffee
+++ b/server/sonar-web/src/main/coffee/design/info-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/design'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
 
   class extends Marionette.ItemView
diff --git a/server/sonar-web/src/main/coffee/design/view.coffee b/server/sonar-web/src/main/coffee/design/view.coffee
index ea2483623b5..9df72c06c99 100644
--- a/server/sonar-web/src/main/coffee/design/view.coffee
+++ b/server/sonar-web/src/main/coffee/design/view.coffee
@@ -1,11 +1,8 @@
 define [
-  'backbone.marionette',
   'design/info-view',
   'templates/design'
 ], (
-  Marionette,
   InfoView
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issue/collections/action-plans.coffee b/server/sonar-web/src/main/coffee/issue/collections/action-plans.coffee
index 69e0d459de1..dd79028fbf6 100644
--- a/server/sonar-web/src/main/coffee/issue/collections/action-plans.coffee
+++ b/server/sonar-web/src/main/coffee/issue/collections/action-plans.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class ActionPlans extends Backbone.Collection
 
@@ -11,4 +7,4 @@ define [
 
 
     parse: (r) ->
-      r.actionPlans
\ No newline at end of file
+      r.actionPlans
diff --git a/server/sonar-web/src/main/coffee/issue/collections/issues.coffee b/server/sonar-web/src/main/coffee/issue/collections/issues.coffee
index 7dc4da76734..aba8c5034b7 100644
--- a/server/sonar-web/src/main/coffee/issue/collections/issues.coffee
+++ b/server/sonar-web/src/main/coffee/issue/collections/issues.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone'
   'issue/models/issue'
 ], (
-  Backbone
   Issue
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issue/issue-view.coffee b/server/sonar-web/src/main/coffee/issue/issue-view.coffee
index b56ea55e2fa..c1372167f77 100644
--- a/server/sonar-web/src/main/coffee/issue/issue-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/issue-view.coffee
@@ -1,7 +1,4 @@
 define [
-  'backbone.marionette'
-  'templates/issue'
-
   'issue/models/changelog'
   'issue/views/changelog-view'
 
@@ -16,10 +13,9 @@ define [
   'issue/views/more-actions-view'
   'issue/views/rule-overlay'
 
-], (
-  Marionette
-  Templates
+  'templates/issue'
 
+], (
   ChangeLog
   ChangeLogView
 
diff --git a/server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee b/server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee
index 9627c48ffaf..677808eef00 100644
--- a/server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/manual-issue-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/issue'
-], (
-  Marionette
-  Templates
-) ->
+], ->
 
   $ = jQuery
   API_ISSUE = "#{baseUrl}/api/issues/show"
diff --git a/server/sonar-web/src/main/coffee/issue/models/changelog.coffee b/server/sonar-web/src/main/coffee/issue/models/changelog.coffee
index eda1d6f88e9..dc19a7f354a 100644
--- a/server/sonar-web/src/main/coffee/issue/models/changelog.coffee
+++ b/server/sonar-web/src/main/coffee/issue/models/changelog.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class ChangeLog extends Backbone.Collection
 
@@ -11,4 +7,4 @@ define [
 
 
     parse: (r) ->
-      return r.changelog
\ No newline at end of file
+      return r.changelog
diff --git a/server/sonar-web/src/main/coffee/issue/models/issue.coffee b/server/sonar-web/src/main/coffee/issue/models/issue.coffee
index aa5f34b1332..efb62c7767a 100644
--- a/server/sonar-web/src/main/coffee/issue/models/issue.coffee
+++ b/server/sonar-web/src/main/coffee/issue/models/issue.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class Issue extends Backbone.Model
     idAttribute: 'key'
diff --git a/server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee
index c2307be8d68..ebff3de408a 100644
--- a/server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/assign-form-view.coffee
@@ -1,8 +1,7 @@
 define [
-  'templates/issue'
   'issue/views/action-options-view'
+  'templates/issue'
 ], (
-  Templates
   ActionOptionsView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issue/views/changelog-view.coffee b/server/sonar-web/src/main/coffee/issue/views/changelog-view.coffee
index fffc5b3700d..b6446092610 100644
--- a/server/sonar-web/src/main/coffee/issue/views/changelog-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/changelog-view.coffee
@@ -1,8 +1,7 @@
 define [
-  'templates/issue'
   'common/popup'
+  'templates/issue'
 ], (
-  Templates
   PopupView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee
index 399bf5c1689..f6f1c831109 100644
--- a/server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/comment-form-view.coffee
@@ -1,8 +1,7 @@
 define [
-  'templates/issue'
   'common/popup'
+  'templates/issue'
 ], (
-  Templates
   PopupView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issue/views/more-actions-view.coffee b/server/sonar-web/src/main/coffee/issue/views/more-actions-view.coffee
index 19d3a72a688..8cdb60bcc30 100644
--- a/server/sonar-web/src/main/coffee/issue/views/more-actions-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/more-actions-view.coffee
@@ -1,8 +1,7 @@
 define [
-  'templates/issue'
   'common/popup'
+  'templates/issue'
 ], (
-  Templates
   PopupView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee
index a6b698d00a2..837ec7bd7ac 100644
--- a/server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/plan-form-view.coffee
@@ -1,8 +1,7 @@
 define [
-  'templates/issue'
   'issue/views/action-options-view'
+  'templates/issue'
 ], (
-  Templates
   ActionOptionsView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee b/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee
index 8f87f1eecbf..252e6c817fc 100644
--- a/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/rule-overlay.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issue'
 ], (
   ModalView
-  Templates
 ) ->
 
   class extends ModalView
diff --git a/server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee b/server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee
index 360ebe2dc74..b8110244861 100644
--- a/server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee
+++ b/server/sonar-web/src/main/coffee/issue/views/set-severity-form-view.coffee
@@ -1,8 +1,7 @@
 define [
-  'templates/issue'
   'issue/views/action-options-view'
+  'templates/issue'
 ], (
-  Templates
   ActionOptionsView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issues/app-new.coffee b/server/sonar-web/src/main/coffee/issues/app-new.coffee
index c40aeee41de..d2188d556bc 100644
--- a/server/sonar-web/src/main/coffee/issues/app-new.coffee
+++ b/server/sonar-web/src/main/coffee/issues/app-new.coffee
@@ -1,24 +1,8 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-
 
 requirejs [
-  'backbone', 'backbone.marionette'
-
   'issues/models/state'
   'issues/layout'
   'issues/models/issues'
@@ -35,11 +19,7 @@ requirejs [
   'issues/filters-view'
 
   'issues/help-view'
-
-  'common/handlebars-extensions'
 ], (
-  Backbone, Marionette
-
   State
   Layout
   Issues
diff --git a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
index 31f3c0baff5..9979b1ad5ba 100644
--- a/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
+++ b/server/sonar-web/src/main/coffee/issues/component-viewer/main.coffee
@@ -1,14 +1,9 @@
 define [
-  'backbone'
-  'backbone.marionette'
-  'templates/issues'
   'source-viewer/viewer'
   'issues/models/issues'
   'issues/component-viewer/issue-view'
+  'templates/issues'
 ], (
-  Backbone
-  Marionette
-  Templates
   SourceViewer
   Issues
   IssueView
diff --git a/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee
index 4959fd2a728..85f82ff171b 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/action-plan-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
index 43c48eb193d..347c68aa2ef 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/assignee-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   CustomValuesFacet
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
index a9781dfcbe1..f839f457fbc 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/base-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
   class extends BaseFacet
diff --git a/server/sonar-web/src/main/coffee/issues/facets/component-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/component-facet.coffee
index e9017c904bc..9fd341da3ee 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/component-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/component-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
index 21ed4e09a3d..45672f29202 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/creation-date-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee
index 9a58fde599d..df36686142f 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/custom-values-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
 
diff --git a/server/sonar-web/src/main/coffee/issues/facets/issue-key-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/issue-key-facet.coffee
index c54225bfab3..4af71a4b10c 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/issue-key-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/issue-key-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
 
diff --git a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
index ed3bb7e5450..267cf954c5a 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/resolution-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee
index 6ca5d8a259e..b0b605c6a09 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/severity-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
 
diff --git a/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee b/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee
index 4c330963b73..8b35191eabf 100644
--- a/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/facets/status-facet.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   BaseFacet
-  Templates
 ) ->
 
 
diff --git a/server/sonar-web/src/main/coffee/issues/filters-view.coffee b/server/sonar-web/src/main/coffee/issues/filters-view.coffee
index a1dfae26087..c8ce1732134 100644
--- a/server/sonar-web/src/main/coffee/issues/filters-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/filters-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/issues'
-], (
-  Marionette
-  Templates
-) ->
+], ->
 
   $ = jQuery
 
diff --git a/server/sonar-web/src/main/coffee/issues/help-view.coffee b/server/sonar-web/src/main/coffee/issues/help-view.coffee
index 2524f91da85..fee70a973c5 100644
--- a/server/sonar-web/src/main/coffee/issues/help-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/help-view.coffee
@@ -1,24 +1,8 @@
-#$dialog
-#.dialog({
-#      dialogClass: "no-close",
-#      width: width,
-#      draggable: false,
-#      autoOpen: false,
-#      modal: true,
-#      minHeight: 50,
-#      resizable: false,
-#      title: null,
-#      close: function () {
-#      $j('#modal').remove();
-#}
-#});
-
 define [
   'common/modals'
   'templates/issues'
 ], (
   ModalView
-  Templates
 ) ->
 
 
diff --git a/server/sonar-web/src/main/coffee/issues/layout.coffee b/server/sonar-web/src/main/coffee/issues/layout.coffee
index 85d06a2a3f1..6d2a60fe82b 100644
--- a/server/sonar-web/src/main/coffee/issues/layout.coffee
+++ b/server/sonar-web/src/main/coffee/issues/layout.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/issues'
-], (
-  Marionette
-  Templates
-) ->
+], ->
 
   $ = jQuery
 
diff --git a/server/sonar-web/src/main/coffee/issues/models/facet.coffee b/server/sonar-web/src/main/coffee/issues/models/facet.coffee
index 4a80c47bba4..99bf846c240 100644
--- a/server/sonar-web/src/main/coffee/issues/models/facet.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/facet.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class extends Backbone.Model
     idAttribute: 'property'
diff --git a/server/sonar-web/src/main/coffee/issues/models/facets.coffee b/server/sonar-web/src/main/coffee/issues/models/facets.coffee
index b0be4ad3c3c..2650058e057 100644
--- a/server/sonar-web/src/main/coffee/issues/models/facets.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/facets.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone'
   'issues/models/facet'
 ], (
-  Backbone
   Facet
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issues/models/filter.coffee b/server/sonar-web/src/main/coffee/issues/models/filter.coffee
index bbb881f924e..63dc4200299 100644
--- a/server/sonar-web/src/main/coffee/issues/models/filter.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/filter.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class extends Backbone.Model
 
diff --git a/server/sonar-web/src/main/coffee/issues/models/filters.coffee b/server/sonar-web/src/main/coffee/issues/models/filters.coffee
index b6c8f9dc59f..d9377baf9d1 100644
--- a/server/sonar-web/src/main/coffee/issues/models/filters.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/filters.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone'
   'issues/models/filter'
 ], (
-  Backbone
   Filter
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issues/models/issues.coffee b/server/sonar-web/src/main/coffee/issues/models/issues.coffee
index 9a242a735b2..4806cd1c00c 100644
--- a/server/sonar-web/src/main/coffee/issues/models/issues.coffee
+++ b/server/sonar-web/src/main/coffee/issues/models/issues.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone'
   'issue/models/issue'
 ], (
-  Backbone
   Issue
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
index 696261ffab1..b60ed4da24b 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-header-view.coffee
@@ -3,7 +3,6 @@ define [
   'templates/issues'
 ], (
   WorkspaceHeaderView
-  Templates
 ) ->
 
   $ = jQuery
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee
index f77d383a31a..cbd2ec4ca31 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-list-empty-view.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone.marionette'
-], (
-  Marionette
-) ->
+define ->
 
   class extends Marionette.ItemView
     className: 'search-navigator-no-results'
diff --git a/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee b/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
index 7b139ff35b1..b659fcf1b6f 100644
--- a/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/issues/workspace-list-view.coffee
@@ -1,11 +1,10 @@
 define [
   'components/navigator/workspace-list-view'
-  'templates/issues'
   'issues/workspace-list-item-view'
   'issues/workspace-list-empty-view'
+  'templates/issues'
 ], (
   WorkspaceListView
-  Templates
   IssueView
   EmptyView
 ) ->
diff --git a/server/sonar-web/src/main/coffee/libraries/app.coffee b/server/sonar-web/src/main/coffee/libraries/app.coffee
index 7d98074346c..d1cc1534f87 100644
--- a/server/sonar-web/src/main/coffee/libraries/app.coffee
+++ b/server/sonar-web/src/main/coffee/libraries/app.coffee
@@ -1,27 +1,10 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-
 
 requirejs [
-  'backbone', 'backbone.marionette'
   'libraries/view'
-  'common/handlebars-extensions'
 ], (
-  Backbone, Marionette
   LibrariesView
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/libraries/view.coffee b/server/sonar-web/src/main/coffee/libraries/view.coffee
index 90ca0673ec1..c442cc376a5 100644
--- a/server/sonar-web/src/main/coffee/libraries/view.coffee
+++ b/server/sonar-web/src/main/coffee/libraries/view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette'
   'templates/libraries'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   $ = jQuery
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/app.coffee b/server/sonar-web/src/main/coffee/quality-gate/app.coffee
index f3de49b69fe..076f0dc81ff 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/app.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/app.coffee
@@ -1,39 +1,15 @@
 requirejs.config
   baseUrl: "#{baseUrl}/js"
 
-  paths:
-    'jquery': 'third-party/jquery'
-    'backbone': 'third-party/backbone'
-    'backbone.marionette': 'third-party/backbone.marionette'
-    'handlebars': 'third-party/handlebars'
-    'moment': 'third-party/moment'
-    'select-list': 'common/select-list'
-
-  shim:
-    'backbone.marionette':
-      deps: ['backbone']
-      exports: 'Marionette'
-    'backbone':
-      exports: 'Backbone'
-    'handlebars':
-      exports: 'Handlebars'
-    'moment':
-      exports: 'moment'
-    'select-list':
-      exports: 'SelectList'
-
 
 requirejs [
-  'backbone', 'backbone.marionette', 'handlebars',
   'quality-gate/collections/quality-gates',
   'quality-gate/views/quality-gate-sidebar-list-view',
   'quality-gate/views/quality-gate-actions-view',
   'quality-gate/views/quality-gate-edit-view',
   'quality-gate/router',
-  'quality-gate/layout',
-  'common/handlebars-extensions'
+  'quality-gate/layout'
 ], (
-  Backbone, Marionette, Handlebars,
   QualityGates,
   QualityGateSidebarListItemView,
   QualityGateActionsView,
diff --git a/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee b/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee
index 8899fc14405..e9e196dbfdd 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/collections/conditions.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone',
   'quality-gate/models/condition'
 ], (
-  Backbone,
   Condition
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee b/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee
index 1d1c8542481..9fbae78dd88 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/collections/quality-gates.coffee
@@ -1,8 +1,6 @@
 define [
-  'backbone',
   'quality-gate/models/quality-gate'
 ], (
-  Backbone,
   QualityGate
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/layout.coffee b/server/sonar-web/src/main/coffee/quality-gate/layout.coffee
index 0b5941655d5..9a982cf1e02 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/layout.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/layout.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class AppLayout extends Marionette.Layout
     className: 'navigator quality-gates-navigator'
@@ -47,4 +43,4 @@ define [
 
 
     onRender: ->
-      @updateLayout()
\ No newline at end of file
+      @updateLayout()
diff --git a/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee b/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee
index 1fe2c634a41..58122a17fd5 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/models/condition.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class Condition extends Backbone.Model
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee b/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee
index 5acffc066e7..a80f1d9fe29 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/models/quality-gate.coffee
@@ -1,8 +1,4 @@
-define [
-  'backbone'
-], (
-  Backbone
-) ->
+define ->
 
   class QualityGate extends Backbone.Model
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/router.coffee b/server/sonar-web/src/main/coffee/quality-gate/router.coffee
index f21161a97bf..9bb56410f9a 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/router.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/router.coffee
@@ -1,10 +1,8 @@
 define [
-  'backbone',
   'quality-gate/models/quality-gate',
   'quality-gate/views/quality-gate-detail-view',
   'quality-gate/views/quality-gate-detail-header-view',
 ], (
-  Backbone,
   QualityGate,
   QualityGateDetailView,
   QualityGateDetailHeaderView
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee
index 6025a3c5b3c..1272034187c 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-actions-view.coffee
@@ -1,10 +1,7 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates'
   'quality-gate/models/quality-gate'
+  'templates/quality-gates'
 ], (
-  Marionette,
-  Templates
   QualityGate
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
index bf5af58c8e9..d02ab76076d 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-condition-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateDetailConditionView extends Marionette.ItemView
     tagName: 'tr'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee
index 9c0362f4e6a..b641ff44445 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-empty-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateDetailConditionsView extends Marionette.ItemView
     tagName: 'tr'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee
index c7d2e4dcd99..5bf81089235 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-conditions-view.coffee
@@ -1,12 +1,9 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates'
   'quality-gate/models/condition',
   'quality-gate/views/quality-gate-detail-condition-view',
   'quality-gate/views/quality-gate-detail-conditions-empty-view'
+  'templates/quality-gates'
 ], (
-  Marionette,
-  Templates
   Condition,
   QualityGateDetailConditionView,
   QualityGateDetailConditionsEmptyView,
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
index 5575f63b1b6..3bcc07e9eaf 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-header-view.coffee
@@ -1,10 +1,7 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates',
   'quality-gate/models/quality-gate'
+  'templates/quality-gates',
 ], (
-  Marionette,
-  Templates
   QualityGate
 ) ->
 
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee
index 90b3abb9773..4a8dd3ed7eb 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-projects-view.coffee
@@ -1,11 +1,7 @@
 define [
-  'backbone.marionette',
+  'common/select-list'
   'templates/quality-gates'
-  'select-list'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateDetailProjectsView extends Marionette.ItemView
     template: Templates['quality-gate-detail-projects']
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee
index ff2ca9c70ea..0c105d13714 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-detail-view.coffee
@@ -1,13 +1,10 @@
 define [
-  'backbone.marionette',
-  'templates/quality-gates',
   'quality-gate/collections/conditions',
   'quality-gate/views/quality-gate-detail-header-view',
   'quality-gate/views/quality-gate-detail-conditions-view',
   'quality-gate/views/quality-gate-detail-projects-view'
+  'templates/quality-gates',
 ], (
-  Marionette,
-  Templates,
   Conditions,
   QualityGateDetailHeaderView,
   QualityGateDetailConditionsView,
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee
index 864083804e6..81fc2f25a7e 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-edit-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateEditView extends Marionette.ItemView
     template: Templates['quality-gate-edit']
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee
index c828e4b72f2..272ae3e316d 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-empty-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateSidebarListEmptyView extends Marionette.ItemView
     tagName: 'li'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee
index 70cd6d15366..d2c618fa745 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-item-view.coffee
@@ -1,10 +1,6 @@
 define [
-  'backbone.marionette',
   'templates/quality-gates'
-], (
-  Marionette,
-  Templates
-) ->
+], ->
 
   class QualityGateSidebarListItemView extends Marionette.ItemView
     tagName: 'li'
diff --git a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee
index 43f92f74d27..063fd569a2c 100644
--- a/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee
+++ b/server/sonar-web/src/main/coffee/quality-gate/views/quality-gate-sidebar-list-view.coffee
@@ -1,9 +1,7 @@
 define [
-  'backbone.marionette',
   'quality-gate/views/quality-gate-sidebar-list-item-view',
   'quality-gate/views/quality-gate-sidebar-list-empty-view'
 ], (
-  Marionette,
   QualityGateSidebarListItemView,
   QualityGateSidebarListEmptyView,
 ) ->
diff --git a/server/sonar-web/src/main/hbs/navigator/choice-filter-template.hbs b/server/sonar-web/src/main/hbs/navigator/choice-filter-template.hbs
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/server/sonar-web/src/main/js/coding-rules/app.js b/server/sonar-web/src/main/js/coding-rules/app.js
index 4dfb34661a7..cbf845d6410 100644
--- a/server/sonar-web/src/main/js/coding-rules/app.js
+++ b/server/sonar-web/src/main/js/coding-rules/app.js
@@ -1,31 +1,9 @@
 requirejs.config({
-  baseUrl: baseUrl + '/js',
-
-  paths: {
-    'backbone': 'third-party/backbone',
-    'backbone.marionette': 'third-party/backbone.marionette',
-    'handlebars': 'third-party/handlebars'
-  },
-
-  shim: {
-    'backbone.marionette': {
-      deps: ['backbone'],
-      exports: 'Marionette'
-    },
-    'backbone': {
-      exports: 'Backbone'
-    },
-    'handlebars': {
-      exports: 'Handlebars'
-    }
-  }
+  baseUrl: baseUrl + '/js'
 });
 
 
 requirejs([
-  'backbone',
-  'backbone.marionette',
-
   'coding-rules/models/state',
   'coding-rules/layout',
   'coding-rules/models/rules',
@@ -38,13 +16,9 @@ requirejs([
   'coding-rules//workspace-header-view',
 
   'coding-rules/facets-view',
-  'coding-rules/filters-view',
-
-  'common/handlebars-extensions'
+  'coding-rules/filters-view'
 ],
-    function (Backbone,
-              Marionette,
-              State,
+    function (State,
               Layout,
               Rules,
               Facets,
diff --git a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js
index 3067968349b..ddf8c97c525 100644
--- a/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/bulk-change-modal-view.js
@@ -1,7 +1,7 @@
 define([
     'common/modal-form',
     'templates/coding-rules'
-], function (ModalFormView, Templates) {
+], function (ModalFormView) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js b/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js
index e373bd04da6..a8eb0b8fb96 100644
--- a/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/bulk-change-popup-view.js
@@ -1,8 +1,8 @@
 define([
     'common/popup',
-    'templates/coding-rules',
-    'coding-rules/bulk-change-modal-view'
-], function (PopupView, Templates, BulkChangeModalView) {
+    'coding-rules/bulk-change-modal-view',
+    'templates/coding-rules'
+], function (PopupView, BulkChangeModalView) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js
index f6ec4dd731b..bd95f6519f7 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/active-severity-facet.js
@@ -1,7 +1,7 @@
 define([
   'coding-rules/facets/base-facet',
   'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   return BaseFacet.extend({
     template: Templates['coding-rules-severity-facet'],
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js
index d98f5528896..573ca2abd0b 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/available-since-facet.js
@@ -1,7 +1,7 @@
 define([
   'coding-rules/facets/base-facet',
   'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   return BaseFacet.extend({
     template: Templates['coding-rules-available-since-facet'],
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js
index b757662d197..cddf9d99129 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/base-facet.js
@@ -1,7 +1,7 @@
 define([
     'components/navigator/facets/base-facet',
     'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   return BaseFacet.extend({
     className: 'search-navigator-facet-box',
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js
index 3c434fba6fe..778a044590d 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/quality-profile-facet.js
@@ -1,7 +1,7 @@
 define([
   'coding-rules/facets/base-facet',
   'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js
index 876cbe61d40..02fc32ac368 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/query-facet.js
@@ -1,7 +1,7 @@
 define([
     'coding-rules/facets/base-facet',
     'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   return BaseFacet.extend({
     template: Templates['coding-rules-query-facet'],
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js
index 133cc18c3a6..219a5e67c85 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/severity-facet.js
@@ -1,7 +1,7 @@
 define([
     'coding-rules/facets/base-facet',
     'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   return BaseFacet.extend({
     template: Templates['coding-rules-severity-facet'],
diff --git a/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js b/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js
index 783a6c6bb89..81a031da126 100644
--- a/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js
+++ b/server/sonar-web/src/main/js/coding-rules/facets/template-facet.js
@@ -1,7 +1,7 @@
 define([
   'coding-rules/facets/base-facet',
   'templates/coding-rules'
-], function (BaseFacet, Templates) {
+], function (BaseFacet) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/filters-view.js b/server/sonar-web/src/main/js/coding-rules/filters-view.js
index d46f4f68e12..451790ea2b6 100644
--- a/server/sonar-web/src/main/js/coding-rules/filters-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/filters-view.js
@@ -1,8 +1,7 @@
 define([
-    'backbone.marionette',
-    'templates/coding-rules',
-    'coding-rules/rule/manual-rule-creation-view'
-], function (Marionette, Templates, ManualRuleCreationView) {
+    'coding-rules/rule/manual-rule-creation-view',
+    'templates/coding-rules'
+], function (ManualRuleCreationView) {
 
   return Marionette.ItemView.extend({
     template: Templates['coding-rules-filters'],
diff --git a/server/sonar-web/src/main/js/coding-rules/layout.js b/server/sonar-web/src/main/js/coding-rules/layout.js
index f6386fa375a..412b832f9b9 100644
--- a/server/sonar-web/src/main/js/coding-rules/layout.js
+++ b/server/sonar-web/src/main/js/coding-rules/layout.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'templates/coding-rules'
-], function (Marionette, Templates) {
+], function () {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/models/rule.js b/server/sonar-web/src/main/js/coding-rules/models/rule.js
index edfd042fe0a..14f4b9b1f56 100644
--- a/server/sonar-web/src/main/js/coding-rules/models/rule.js
+++ b/server/sonar-web/src/main/js/coding-rules/models/rule.js
@@ -1,6 +1,4 @@
-define([
-    'backbone'
-], function (Backbone) {
+define(function () {
 
   return Backbone.Model.extend({
     idAttribute: 'key',
diff --git a/server/sonar-web/src/main/js/coding-rules/models/rules.js b/server/sonar-web/src/main/js/coding-rules/models/rules.js
index 12c8aadb0e3..d0cc24411e6 100644
--- a/server/sonar-web/src/main/js/coding-rules/models/rules.js
+++ b/server/sonar-web/src/main/js/coding-rules/models/rules.js
@@ -1,7 +1,6 @@
 define([
-  'backbone',
   'coding-rules/models/rule'
-], function (Backbone, Rule) {
+], function (Rule) {
 
   return Backbone.Collection.extend({
     model: Rule,
diff --git a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js
index 5ae027f524b..95475fe7b5a 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule-details-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule-details-view.js
@@ -1,20 +1,15 @@
 define([
-  'backbone',
-  'backbone.marionette',
-  'templates/coding-rules',
-  'coding-rules/models/rules',
-  'coding-rules/rule/rule-meta-view',
-  'coding-rules/rule/rule-description-view',
-  'coding-rules/rule/rule-parameters-view',
-  'coding-rules/rule/rule-profiles-view',
-  'coding-rules/rule/custom-rules-view',
-  'coding-rules/rule/manual-rule-creation-view',
-  'coding-rules/rule/rule-issues-view'
-],
-    function (Backbone,
-              Marionette,
-              Templates,
-              Rules,
+      'coding-rules/models/rules',
+      'coding-rules/rule/rule-meta-view',
+      'coding-rules/rule/rule-description-view',
+      'coding-rules/rule/rule-parameters-view',
+      'coding-rules/rule/rule-profiles-view',
+      'coding-rules/rule/custom-rules-view',
+      'coding-rules/rule/manual-rule-creation-view',
+      'coding-rules/rule/rule-issues-view',
+      'templates/coding-rules'
+    ],
+    function (Rules,
               MetaView,
               DescView,
               ParamView,
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js
index ccab3a0d7b9..efa3a520e14 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-creation-view.js
@@ -1,7 +1,7 @@
 define([
   'common/modal-form',
   'templates/coding-rules'
-], function (ModalFormView, Templates) {
+], function (ModalFormView) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js
index cb96f91c5c9..346823ad9af 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rule-view.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'templates/coding-rules'
-], function (Marionette, Templates) {
+], function () {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js b/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js
index ea519ab4b51..1517464defb 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/custom-rules-view.js
@@ -1,9 +1,8 @@
 define([
-  'backbone.marionette',
-  'templates/coding-rules',
   'coding-rules/rule/custom-rule-view',
-  'coding-rules/rule/custom-rule-creation-view'
-], function (Marionette, Templates, CustomRuleView, CustomRuleCreationView) {
+  'coding-rules/rule/custom-rule-creation-view',
+  'templates/coding-rules'
+], function (CustomRuleView, CustomRuleCreationView) {
 
   return Marionette.CompositeView.extend({
     template: Templates['coding-rules-custom-rules'],
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js
index 53f58f0b2aa..0bd198dafac 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/manual-rule-creation-view.js
@@ -1,7 +1,7 @@
 define([
   'common/modal-form',
   'templates/coding-rules'
-], function (ModalFormView, Templates) {
+], function (ModalFormView) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js b/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js
index b34b4d83125..a9c0bee72d0 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/profile-activation-view.js
@@ -1,7 +1,7 @@
 define([
   'common/modals',
   'templates/coding-rules'
-], function (Modal, Templates) {
+], function (Modal) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js
index dfbe5e156d4..979f43e1afc 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-description-view.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'templates/coding-rules'
-], function (Marionette, Templates) {
+], function () {
 
   return Marionette.ItemView.extend({
     template: Templates['coding-rules-rule-description'],
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js
index 31daddd1892..4a0643471c7 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-issues-view.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'templates/coding-rules'
-], function (Marionette, Templates) {
+], function () {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js
index f1558079700..61f82bc09c6 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-meta-view.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'templates/coding-rules'
-], function (Marionette, Templates) {
+], function () {
 
   return Marionette.ItemView.extend({
     template: Templates['coding-rules-rule-meta'],
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js
index f2572460033..ad7820b8e8d 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-parameters-view.js
@@ -1,7 +1,6 @@
 define([
-    'backbone.marionette',
     'templates/coding-rules'
-], function (Marionette, Templates) {
+], function () {
 
   return Marionette.ItemView.extend({
     template: Templates['coding-rules-rule-parameters'],
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js
index 5a9d29b731a..5625796913d 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-profile-view.js
@@ -1,8 +1,7 @@
 define([
-  'backbone.marionette',
-  'templates/coding-rules',
-  'coding-rules/rule/profile-activation-view'
-], function (Marionette, Templates, ProfileActivationView) {
+  'coding-rules/rule/profile-activation-view',
+  'templates/coding-rules'
+], function (ProfileActivationView) {
 
   return Marionette.ItemView.extend({
     tagName: 'tr',
diff --git a/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js b/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js
index 5a7be4748e0..bead27c9bed 100644
--- a/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/rule/rule-profiles-view.js
@@ -1,9 +1,8 @@
 define([
-  'backbone.marionette',
-  'templates/coding-rules',
   'coding-rules/rule/rule-profile-view',
-  'coding-rules/rule/profile-activation-view'
-], function (Marionette, Templates, ProfileView, ProfileActivationView) {
+  'coding-rules/rule/profile-activation-view',
+  'templates/coding-rules'
+], function (ProfileView, ProfileActivationView) {
 
   return Marionette.CompositeView.extend({
     template: Templates['coding-rules-rule-profiles'],
diff --git a/server/sonar-web/src/main/js/coding-rules/show-app.js b/server/sonar-web/src/main/js/coding-rules/show-app.js
index ee68beb0df4..3e815a93f26 100644
--- a/server/sonar-web/src/main/js/coding-rules/show-app.js
+++ b/server/sonar-web/src/main/js/coding-rules/show-app.js
@@ -1,39 +1,13 @@
 requirejs.config({
-  baseUrl: baseUrl + '/js',
-
-  paths: {
-    'backbone': 'third-party/backbone',
-    'backbone.marionette': 'third-party/backbone.marionette',
-    'handlebars': 'third-party/handlebars'
-  },
-
-  shim: {
-    'backbone.marionette': {
-      deps: ['backbone'],
-      exports: 'Marionette'
-    },
-    'backbone': {
-      exports: 'Backbone'
-    },
-    'handlebars': {
-      exports: 'Handlebars'
-    }
-  }
+  baseUrl: baseUrl + '/js'
 });
 
 
 requirejs([
-  'backbone',
-  'backbone.marionette',
-
   'coding-rules/models/rule',
-  'coding-rules/rule-details-view',
-
-  'common/handlebars-extensions'
+  'coding-rules/rule-details-view'
 ],
-    function (Backbone,
-              Marionette,
-              Rule,
+    function (Rule,
               RuleDetailsView) {
 
       var $ = jQuery,
diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js
index ef19ef289a9..cbcebe2db72 100644
--- a/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/workspace-header-view.js
@@ -1,8 +1,8 @@
 define([
   'components/navigator/workspace-header-view',
-  'templates/coding-rules',
-  'coding-rules/bulk-change-popup-view'
-], function (WorkspaceHeaderView, Templates, BulkChangePopup) {
+  'coding-rules/bulk-change-popup-view',
+  'templates/coding-rules'
+], function (WorkspaceHeaderView, BulkChangePopup) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js
index cbb103547d2..da182d39095 100644
--- a/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-empty-view.js
@@ -1,6 +1,4 @@
-define([
-    'backbone.marionette'
-], function (Marionette) {
+define(function () {
 
   return Marionette.ItemView.extend({
     className: 'search-navigator-no-results',
diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js
index c2827277d4b..f7cd1120f15 100644
--- a/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-item-view.js
@@ -1,7 +1,7 @@
 define([
   'components/navigator/workspace-list-item-view',
   'templates/coding-rules'
-], function (WorkspaceListItemView, Templates) {
+], function (WorkspaceListItemView) {
 
   return WorkspaceListItemView.extend({
     className: 'coding-rule',
diff --git a/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js b/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js
index 605e60f942e..f1da56fb627 100644
--- a/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js
+++ b/server/sonar-web/src/main/js/coding-rules/workspace-list-view.js
@@ -1,9 +1,9 @@
 define([
   'components/navigator/workspace-list-view',
-  'templates/coding-rules',
   'coding-rules/workspace-list-item-view',
-  'coding-rules/workspace-list-empty-view'
-], function (WorkspaceListView, Templates, WorkspaceListItemView, WorkspaceListEmptyView) {
+  'coding-rules/workspace-list-empty-view',
+  'templates/coding-rules'
+], function (WorkspaceListView, WorkspaceListItemView, WorkspaceListEmptyView) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/common/handlebars-extensions.js b/server/sonar-web/src/main/js/common/handlebars-extensions.js
index c2754a52dbe..ddbf0671877 100644
--- a/server/sonar-web/src/main/js/common/handlebars-extensions.js
+++ b/server/sonar-web/src/main/js/common/handlebars-extensions.js
@@ -1,26 +1,4 @@
-/* jshint eqeqeq:false */
-
-requirejs.config({
-  paths: {
-    'handlebars': 'third-party/handlebars'
-  },
-
-  shim: {
-    'handlebars': {
-      exports: 'Handlebars'
-    }
-  }
-});
-
-define(['handlebars'], function (Handlebars) {
-
-  /*
-   * Shortcut for templates retrieving
-   */
-  window.getTemplate = function(templateSelector) {
-    return Handlebars.compile(jQuery(templateSelector).html() || '');
-  };
-
+(function () {
   var defaultActions = ['comment', 'assign', 'assign_to_me', 'plan', 'set_severity', 'set_tags'];
 
   Handlebars.registerHelper('log', function() {
@@ -453,4 +431,12 @@ define(['handlebars'], function (Handlebars) {
     return component.projectName + (component.subProjectName ? (' / ' + component.subProjectName) : '');
   });
 
-});
+  Handlebars.registerHelper('repeat', function (number, options) {
+    var ret = '';
+    for (var i = 0; i < number; i++) {
+      ret += options.fn(this);
+    }
+    return ret;
+  });
+
+})();
diff --git a/server/sonar-web/src/main/js/common/modals.js b/server/sonar-web/src/main/js/common/modals.js
index 9ca6cd56b1f..6886465c001 100644
--- a/server/sonar-web/src/main/js/common/modals.js
+++ b/server/sonar-web/src/main/js/common/modals.js
@@ -1,4 +1,4 @@
-define(['backbone.marionette'], function (Marionette) {
+define(function () {
 
   var $ = jQuery,
       EVENT_SCOPE = 'modal';
diff --git a/server/sonar-web/src/main/js/common/select-list.js b/server/sonar-web/src/main/js/common/select-list.js
index 30ca5e50a6f..7c1013c54c5 100644
--- a/server/sonar-web/src/main/js/common/select-list.js
+++ b/server/sonar-web/src/main/js/common/select-list.js
@@ -1,19 +1,8 @@
 requirejs.config({
-  baseUrl: baseUrl + '/js',
-
-  paths: {
-    'backbone': 'third-party/backbone'
-  },
-
-  shim: {
-    'backbone': {
-      exports: 'Backbone'
-    }
-  }
-
+  baseUrl: baseUrl + '/js'
 });
 
-requirejs(['backbone'], function (Backbone) {
+requirejs(function () {
 
   (function ($) {
 
diff --git a/server/sonar-web/src/main/js/components/navigator/controller.js b/server/sonar-web/src/main/js/components/navigator/controller.js
index d1ae597ce0a..edc2adafc2c 100644
--- a/server/sonar-web/src/main/js/components/navigator/controller.js
+++ b/server/sonar-web/src/main/js/components/navigator/controller.js
@@ -1,6 +1,4 @@
-define([
-  'backbone.marionette'
-], function (Marionette) {
+define(function () {
 
   return Marionette.Controller.extend({
     pageSize: 50,
diff --git a/server/sonar-web/src/main/js/components/navigator/facets-view.js b/server/sonar-web/src/main/js/components/navigator/facets-view.js
index 0d3f9102833..6f903a8f799 100644
--- a/server/sonar-web/src/main/js/components/navigator/facets-view.js
+++ b/server/sonar-web/src/main/js/components/navigator/facets-view.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'components/navigator/facets/base-facet'
-], function (Marionette, BaseFacet) {
+], function (BaseFacet) {
 
   return Marionette.CollectionView.extend({
     className: 'search-navigator-facets-list',
diff --git a/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js b/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js
index 50d0da6c496..f49a3c9d944 100644
--- a/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js
+++ b/server/sonar-web/src/main/js/components/navigator/facets/base-facet.js
@@ -1,6 +1,4 @@
-define([
-    'backbone.marionette'
-], function (Marionette) {
+define(function () {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/components/navigator/models/facet.js b/server/sonar-web/src/main/js/components/navigator/models/facet.js
index 7d15da0507a..b154fb58c7f 100644
--- a/server/sonar-web/src/main/js/components/navigator/models/facet.js
+++ b/server/sonar-web/src/main/js/components/navigator/models/facet.js
@@ -1,6 +1,4 @@
-define([
-    'backbone'
-], function (Backbone) {
+define(function () {
 
   return Backbone.Model.extend({
     idAttribute: 'property',
diff --git a/server/sonar-web/src/main/js/components/navigator/models/facets.js b/server/sonar-web/src/main/js/components/navigator/models/facets.js
index 88929deb8da..730dabe7054 100644
--- a/server/sonar-web/src/main/js/components/navigator/models/facets.js
+++ b/server/sonar-web/src/main/js/components/navigator/models/facets.js
@@ -1,7 +1,6 @@
 define([
-  'backbone',
   'components/navigator/models/facet'
-], function (Backbone, Facet) {
+], function (Facet) {
 
   return Backbone.Collection.extend({
     model: Facet
diff --git a/server/sonar-web/src/main/js/components/navigator/models/state.js b/server/sonar-web/src/main/js/components/navigator/models/state.js
index 8a4f2ff669c..ae0bbae67a7 100644
--- a/server/sonar-web/src/main/js/components/navigator/models/state.js
+++ b/server/sonar-web/src/main/js/components/navigator/models/state.js
@@ -1,6 +1,4 @@
-define([
-    'backbone'
-], function (Backbone) {
+define(function () {
 
   return Backbone.Model.extend({
     defaults: {
diff --git a/server/sonar-web/src/main/js/components/navigator/router.js b/server/sonar-web/src/main/js/components/navigator/router.js
index 8792dd519c7..c7e18f2eb12 100644
--- a/server/sonar-web/src/main/js/components/navigator/router.js
+++ b/server/sonar-web/src/main/js/components/navigator/router.js
@@ -1,6 +1,4 @@
-define([
-    'backbone'
-], function (Backbone) {
+define(function () {
 
   return Backbone.Router.extend({
     routeSeparator: '|',
diff --git a/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js b/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js
index aec6efa6284..180550ba26a 100644
--- a/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js
+++ b/server/sonar-web/src/main/js/components/navigator/workspace-header-view.js
@@ -1,6 +1,4 @@
-define([
-    'backbone.marionette'
-], function (Marionette) {
+define(function () {
 
   return Marionette.ItemView.extend({
 
diff --git a/server/sonar-web/src/main/js/components/navigator/workspace-list-item-view.js b/server/sonar-web/src/main/js/components/navigator/workspace-list-item-view.js
index b4bb669303a..2a2e6555c86 100644
--- a/server/sonar-web/src/main/js/components/navigator/workspace-list-item-view.js
+++ b/server/sonar-web/src/main/js/components/navigator/workspace-list-item-view.js
@@ -1,6 +1,4 @@
-define([
-    'backbone.marionette'
-], function (Marionette) {
+define(function () {
 
   return Marionette.ItemView.extend({
 
diff --git a/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js b/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js
index 2c9ef0def7d..096ef1d4fb3 100644
--- a/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js
+++ b/server/sonar-web/src/main/js/components/navigator/workspace-list-view.js
@@ -1,6 +1,4 @@
-define([
-  'backbone.marionette'
-], function (Marionette) {
+define(function () {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/drilldown/app.js b/server/sonar-web/src/main/js/drilldown/app.js
index 5ed7c996cc4..192c6ee867a 100644
--- a/server/sonar-web/src/main/js/drilldown/app.js
+++ b/server/sonar-web/src/main/js/drilldown/app.js
@@ -1,28 +1,10 @@
 requirejs.config({
-  baseUrl: baseUrl + '/js',
-  paths: {
-    'backbone': 'third-party/backbone',
-    'backbone.marionette': 'third-party/backbone.marionette',
-    'handlebars': 'third-party/handlebars'
-  },
-  shim: {
-    'backbone.marionette': {
-      deps: ['backbone'],
-      exports: 'Marionette'
-    },
-    'backbone': {
-      exports: 'Backbone'
-    },
-    'handlebars': {
-      exports: 'Handlebars'
-    }
-  }
+  baseUrl: baseUrl + '/js'
 });
 
 requirejs([
-  'backbone.marionette',
   'source-viewer/viewer'
-], function (Marionette, SourceViewer) {
+], function (SourceViewer) {
 
   var $ = jQuery,
       App = new Marionette.Application();
diff --git a/server/sonar-web/src/main/js/measures/app.js b/server/sonar-web/src/main/js/measures/app.js
index c9e363c600d..3af0ac26953 100644
--- a/server/sonar-web/src/main/js/measures/app.js
+++ b/server/sonar-web/src/main/js/measures/app.js
@@ -1,30 +1,9 @@
 requirejs.config({
-  baseUrl: baseUrl + '/js',
-
-  paths: {
-    'backbone': 'third-party/backbone',
-    'backbone.marionette': 'third-party/backbone.marionette',
-    'handlebars': 'third-party/handlebars'
-  },
-
-  shim: {
-    'backbone.marionette': {
-      deps: ['backbone'],
-      exports: 'Marionette'
-    },
-    'backbone': {
-      exports: 'Backbone'
-    },
-    'handlebars': {
-      exports: 'Handlebars'
-    }
-  }
-
+  baseUrl: baseUrl + '/js'
 });
 
 requirejs(
     [
-      'backbone', 'backbone.marionette',
       'measures/measures-filter-bar',
       'navigator/filters/base-filters',
       'navigator/filters/checkbox-filters',
@@ -35,7 +14,7 @@ requirejs(
       'navigator/filters/string-filters',
       'navigator/filters/metric-filters'
     ],
-    function (Backbone, Marionette, FilterBar, BaseFilters, CheckboxFilterView, ChoiceFilters, AjaxSelectFilters,
+    function (FilterBar, BaseFilters, CheckboxFilterView, ChoiceFilters, AjaxSelectFilters,
               FavoriteFilters, RangeFilters, StringFilterView, MetricFilterView) {
 
       var NavigatorApp = new Marionette.Application();
diff --git a/server/sonar-web/src/main/js/measures/measures-filter-bar.js b/server/sonar-web/src/main/js/measures/measures-filter-bar.js
index 5b5c6b69c90..f9fdcca51e3 100644
--- a/server/sonar-web/src/main/js/measures/measures-filter-bar.js
+++ b/server/sonar-web/src/main/js/measures/measures-filter-bar.js
@@ -1,7 +1,9 @@
-define(['navigator/filters/filter-bar', 'common/handlebars-extensions'], function (FilterBarView) {
+define(['navigator/filters/filter-bar'], function (FilterBarView) {
 
   return FilterBarView.extend({
-    template: getTemplate('#filter-bar-template')
+    template: function () {
+      return jQuery('#filter-bar-template').html();
+    }
   });
 
 });
diff --git a/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js b/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js
index b906a62a864..97bfa5c100d 100644
--- a/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/action-plan-filters.js
@@ -1,8 +1,7 @@
 define([
-  'backbone',
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters'
-], function (Backbone, BaseFilters, ChoiceFilters) {
+], function (BaseFilters, ChoiceFilters) {
 
   return ChoiceFilters.ChoiceFilterView.extend({
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js b/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
index 4037f7172b9..6452a218ff8 100644
--- a/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/ajax-select-filters.js
@@ -1,10 +1,8 @@
 define([
-  'backbone',
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (Backbone, BaseFilters, ChoiceFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters, ChoiceFilters) {
 
   var PAGE_SIZE = 100;
 
@@ -98,7 +96,7 @@ define([
 
   var AjaxSelectDetailsFilterView = ChoiceFilters.DetailsChoiceFilterView.extend({
     template: Templates['ajax-select-filter'],
-    listTemplate: getTemplate('#choice-filter-template'),
+    listTemplate: Templates['choice-filter-template'],
     searchKey: 's',
 
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/base-filters.js b/server/sonar-web/src/main/js/navigator/filters/base-filters.js
index 103f668d40c..bde5e13d6ba 100644
--- a/server/sonar-web/src/main/js/navigator/filters/base-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/base-filters.js
@@ -1,9 +1,6 @@
 define([
-  'backbone',
-  'backbone.marionette',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (Backbone, Marionette, Templates) {
+  'templates/navigator'
+], function () {
 
   var Filter = Backbone.Model.extend({
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js b/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js
index 7bae1e0b47d..91463389d94 100644
--- a/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/checkbox-filters.js
@@ -1,10 +1,7 @@
 define([
-  'backbone',
-  'backbone.marionette',
   'navigator/filters/base-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (Backbone, Marionette, BaseFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters) {
 
   return BaseFilters.BaseFilterView.extend({
     template: Templates['checkbox-filter'],
diff --git a/server/sonar-web/src/main/js/navigator/filters/choice-filters.js b/server/sonar-web/src/main/js/navigator/filters/choice-filters.js
index c36e42ad2a7..1919b7dcd53 100644
--- a/server/sonar-web/src/main/js/navigator/filters/choice-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/choice-filters.js
@@ -1,9 +1,7 @@
 define([
-  'handlebars',
   'navigator/filters/base-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (Handlebars, BaseFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters) {
 
   var DetailsChoiceFilterView = BaseFilters.DetailsFilterView.extend({
     template: Templates['choice-filter'],
diff --git a/server/sonar-web/src/main/js/navigator/filters/context-filters.js b/server/sonar-web/src/main/js/navigator/filters/context-filters.js
index ec71ff3f774..07635deab28 100644
--- a/server/sonar-web/src/main/js/navigator/filters/context-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/context-filters.js
@@ -1,4 +1,4 @@
-define(['backbone'], function (Backbone) {
+define(function () {
 
   return Backbone.View.extend({
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js b/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js
index 4852e30a666..d924d9b9f8a 100644
--- a/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/favorite-filters.js
@@ -1,11 +1,8 @@
 define([
-  'backbone',
-  'backbone.marionette',
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (Backbone, Marionette, BaseFilters, ChoiceFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters, ChoiceFilters) {
 
   var DetailsFavoriteFilterView = BaseFilters.DetailsFilterView.extend({
     template: Templates['favorite-details-filter'],
diff --git a/server/sonar-web/src/main/js/navigator/filters/filter-bar.js b/server/sonar-web/src/main/js/navigator/filters/filter-bar.js
index 4bcec144adf..4d8d35e0138 100644
--- a/server/sonar-web/src/main/js/navigator/filters/filter-bar.js
+++ b/server/sonar-web/src/main/js/navigator/filters/filter-bar.js
@@ -1,12 +1,10 @@
 define(
     [
-      'backbone.marionette',
       'navigator/filters/base-filters',
       'navigator/filters/more-criteria-filters',
-      'navigator/filters/favorite-filters',
-      'common/handlebars-extensions'
+      'navigator/filters/favorite-filters'
     ],
-    function (Marionette, BaseFilters) {
+    function (BaseFilters) {
 
       return Marionette.CompositeView.extend({
         itemViewContainer: '.navigator-filters-list',
diff --git a/server/sonar-web/src/main/js/navigator/filters/metric-filters.js b/server/sonar-web/src/main/js/navigator/filters/metric-filters.js
index 13a63860c06..7b3f3fc09f0 100644
--- a/server/sonar-web/src/main/js/navigator/filters/metric-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/metric-filters.js
@@ -1,8 +1,7 @@
 define([
   'navigator/filters/base-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (BaseFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters) {
 
   var DetailsMetricFilterView = BaseFilters.DetailsFilterView.extend({
     template: Templates['metric-filter'],
diff --git a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js
index 3aab3651787..f4395acecae 100644
--- a/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/more-criteria-filters.js
@@ -1,9 +1,8 @@
 define([
   'navigator/filters/base-filters',
   'navigator/filters/choice-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (BaseFilters, ChoiceFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters, ChoiceFilters) {
 
   var DetailsMoreCriteriaFilterView = ChoiceFilters.DetailsChoiceFilterView.extend({
     template: Templates['more-criteria-details-filter'],
diff --git a/server/sonar-web/src/main/js/navigator/filters/range-filters.js b/server/sonar-web/src/main/js/navigator/filters/range-filters.js
index 1627895022e..56ee86373ac 100644
--- a/server/sonar-web/src/main/js/navigator/filters/range-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/range-filters.js
@@ -1,8 +1,7 @@
 define([
   'navigator/filters/base-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (BaseFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters) {
 
   var DetailsRangeFilterView = BaseFilters.DetailsFilterView.extend({
     template: Templates['range-filter'],
diff --git a/server/sonar-web/src/main/js/navigator/filters/read-only-filters.js b/server/sonar-web/src/main/js/navigator/filters/read-only-filters.js
index 5a203e5214f..184771b8230 100644
--- a/server/sonar-web/src/main/js/navigator/filters/read-only-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/read-only-filters.js
@@ -1,4 +1,4 @@
-define(['backbone', 'navigator/filters/base-filters'], function (Backbone, BaseFilters) {
+define(['navigator/filters/base-filters'], function (BaseFilters) {
 
   return BaseFilters.BaseFilterView.extend({
     className: 'navigator-filter navigator-filter-read-only',
diff --git a/server/sonar-web/src/main/js/navigator/filters/rule-filters.js b/server/sonar-web/src/main/js/navigator/filters/rule-filters.js
index 2de31b1fd3a..29de640e080 100644
--- a/server/sonar-web/src/main/js/navigator/filters/rule-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/rule-filters.js
@@ -1,8 +1,7 @@
 define([
-  'backbone',
   'navigator/filters/base-filters',
   'navigator/filters/ajax-select-filters'
-], function (Backbone, BaseFilters, AjaxSelectFilters) {
+], function (BaseFilters, AjaxSelectFilters) {
 
   var RuleSuggestions = AjaxSelectFilters.Suggestions.extend({
 
diff --git a/server/sonar-web/src/main/js/navigator/filters/string-filters.js b/server/sonar-web/src/main/js/navigator/filters/string-filters.js
index 252d0675082..1377db4c06c 100644
--- a/server/sonar-web/src/main/js/navigator/filters/string-filters.js
+++ b/server/sonar-web/src/main/js/navigator/filters/string-filters.js
@@ -1,8 +1,7 @@
 define([
   'navigator/filters/base-filters',
-  'templates/navigator',
-  'common/handlebars-extensions'
-], function (BaseFilters, Templates) {
+  'templates/navigator'
+], function (BaseFilters) {
 
   var DetailsStringFilterView = BaseFilters.DetailsFilterView.extend({
     template: Templates['string-filter'],
diff --git a/server/sonar-web/src/main/js/source-viewer/app.js b/server/sonar-web/src/main/js/source-viewer/app.js
index 6a4cab910ba..093d2cb7c73 100644
--- a/server/sonar-web/src/main/js/source-viewer/app.js
+++ b/server/sonar-web/src/main/js/source-viewer/app.js
@@ -1,29 +1,11 @@
 requirejs.config({
-  baseUrl: baseUrl + '/js',
-  paths: {
-    'backbone': 'third-party/backbone',
-    'backbone.marionette': 'third-party/backbone.marionette',
-    'handlebars': 'third-party/handlebars'
-  },
-  shim: {
-    'backbone.marionette': {
-      deps: ['backbone'],
-      exports: 'Marionette'
-    },
-    'backbone': {
-      exports: 'Backbone'
-    },
-    'handlebars': {
-      exports: 'Handlebars'
-    }
-  }
+  baseUrl: baseUrl + '/js'
 });
 
 requirejs([
-  'backbone.marionette',
   'source-viewer/viewer'
 
-], function (Marionette, SourceViewer) {
+], function (SourceViewer) {
 
   var App = new Marionette.Application();
 
diff --git a/server/sonar-web/src/main/js/source-viewer/header.js b/server/sonar-web/src/main/js/source-viewer/header.js
index e6fa0a1043f..407a3bab034 100644
--- a/server/sonar-web/src/main/js/source-viewer/header.js
+++ b/server/sonar-web/src/main/js/source-viewer/header.js
@@ -1,9 +1,8 @@
 define([
-  'backbone.marionette',
-  'templates/source-viewer',
   'source-viewer/more-actions',
-  'source-viewer/measures-overlay'
-], function (Marionette, Templates, MoreActionsView, MeasuresOverlay) {
+  'source-viewer/measures-overlay',
+  'templates/source-viewer'
+], function (MoreActionsView, MeasuresOverlay) {
 
   var $ = jQuery,
       API_FAVORITE = baseUrl + '/api/favourites';
diff --git a/server/sonar-web/src/main/js/source-viewer/measures-overlay.js b/server/sonar-web/src/main/js/source-viewer/measures-overlay.js
index 942d66e2050..3a1cc491d9a 100644
--- a/server/sonar-web/src/main/js/source-viewer/measures-overlay.js
+++ b/server/sonar-web/src/main/js/source-viewer/measures-overlay.js
@@ -1,7 +1,7 @@
 define([
   'common/modals',
   'templates/source-viewer'
-], function (ModalView, Templates) {
+], function (ModalView) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/source-viewer/more-actions.js b/server/sonar-web/src/main/js/source-viewer/more-actions.js
index b21bfb4c8c8..5458d52114c 100644
--- a/server/sonar-web/src/main/js/source-viewer/more-actions.js
+++ b/server/sonar-web/src/main/js/source-viewer/more-actions.js
@@ -1,7 +1,6 @@
 define([
-  'backbone.marionette',
   'templates/source-viewer'
-], function (Marionette, Templates) {
+], function () {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js b/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js
index c75bae6bb54..2a9242f8f17 100644
--- a/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js
+++ b/server/sonar-web/src/main/js/source-viewer/popups/coverage-popup.js
@@ -1,8 +1,7 @@
 define([
-  'backbone.marionette',
-  'templates/source-viewer',
-  'common/popup'
-], function (Marionette, Templates, Popup) {
+  'common/popup',
+  'templates/source-viewer'
+], function (Popup) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/source-viewer/popups/duplication-popup.js b/server/sonar-web/src/main/js/source-viewer/popups/duplication-popup.js
index 05f8d106376..35148e78107 100644
--- a/server/sonar-web/src/main/js/source-viewer/popups/duplication-popup.js
+++ b/server/sonar-web/src/main/js/source-viewer/popups/duplication-popup.js
@@ -1,8 +1,7 @@
 define([
-  'backbone.marionette',
-  'templates/source-viewer',
-  'common/popup'
-], function (Marionette, Templates, Popup) {
+  'common/popup',
+  'templates/source-viewer'
+], function (Popup) {
 
   var $ = jQuery;
 
diff --git a/server/sonar-web/src/main/js/source-viewer/popups/line-actions-popup.js b/server/sonar-web/src/main/js/source-viewer/popups/line-actions-popup.js
index d16243e7eef..ef739fb5b45 100644
--- a/server/sonar-web/src/main/js/source-viewer/popups/line-actions-popup.js
+++ b/server/sonar-web/src/main/js/source-viewer/popups/line-actions-popup.js
@@ -1,9 +1,8 @@
 define([
-  'backbone.marionette',
-  'templates/source-viewer',
   'common/popup',
-  'issue/manual-issue-view'
-], function (Marionette, Templates, Popup, ManualIssueView) {
+  'issue/manual-issue-view',
+  'templates/source-viewer'
+], function (Popup, ManualIssueView) {
 
   return Popup.extend({
     template: Templates['source-viewer-line-options-popup'],
diff --git a/server/sonar-web/src/main/js/source-viewer/popups/scm-popup.js b/server/sonar-web/src/main/js/source-viewer/popups/scm-popup.js
index a12569c8909..3783fce97a7 100644
--- a/server/sonar-web/src/main/js/source-viewer/popups/scm-popup.js
+++ b/server/sonar-web/src/main/js/source-viewer/popups/scm-popup.js
@@ -1,8 +1,7 @@
 define([
-  'backbone.marionette',
-  'templates/source-viewer',
-  'common/popup'
-], function (Marionette, Templates, Popup) {
+  'common/popup',
+  'templates/source-viewer'
+], function (Popup) {
 
   return Popup.extend({
     template: Templates['source-viewer-scm-popup'],
diff --git a/server/sonar-web/src/main/js/source-viewer/source.js b/server/sonar-web/src/main/js/source-viewer/source.js
index 3b511952d39..196669e539f 100644
--- a/server/sonar-web/src/main/js/source-viewer/source.js
+++ b/server/sonar-web/src/main/js/source-viewer/source.js
@@ -1,6 +1,4 @@
-define([
-  'backbone'
-], function (Backbone) {
+define(function () {
 
   return Backbone.Model.extend({
     idAttribute: 'uuid',
diff --git a/server/sonar-web/src/main/js/source-viewer/viewer.js b/server/sonar-web/src/main/js/source-viewer/viewer.js
index d82cbe0a2a3..fcb4fb1e958 100644
--- a/server/sonar-web/src/main/js/source-viewer/viewer.js
+++ b/server/sonar-web/src/main/js/source-viewer/viewer.js
@@ -1,7 +1,4 @@
 define([
-      'backbone',
-      'backbone.marionette',
-      'templates/source-viewer',
       'source-viewer/source',
       'issue/models/issue',
       'issue/collections/issues',
@@ -11,12 +8,9 @@ define([
       'source-viewer/popups/coverage-popup',
       'source-viewer/popups/duplication-popup',
       'source-viewer/popups/line-actions-popup',
-      'common/handlebars-extensions'
+      'templates/source-viewer'
     ],
-    function (Backbone,
-              Marionette,
-              Templates,
-              Source,
+    function (Source,
               Issue,
               Issues,
               IssueView,
diff --git a/server/sonar-web/src/main/js/third-party/handlebars.js b/server/sonar-web/src/main/js/third-party/handlebars.js
index 1c64ca507d8..8ae0445c57b 100644
--- a/server/sonar-web/src/main/js/third-party/handlebars.js
+++ b/server/sonar-web/src/main/js/third-party/handlebars.js
@@ -1,2610 +1,660 @@
 /*!
 
- handlebars v1.2.0
-
-Copyright (C) 2011 by Yehuda Katz
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-@license
-*/
-var Handlebars = (function() {
-// handlebars/safe-string.js
-var __module4__ = (function() {
-  "use strict";
-  var __exports__;
-  // Build out our basic SafeString type
-  function SafeString(string) {
-    this.string = string;
-  }
-
-  SafeString.prototype.toString = function() {
-    return "" + this.string;
-  };
-
-  __exports__ = SafeString;
-  return __exports__;
-})();
-
-// handlebars/utils.js
-var __module3__ = (function(__dependency1__) {
-  "use strict";
-  var __exports__ = {};
-  /*jshint -W004 */
-  var SafeString = __dependency1__;
-
-  var escape = {
-    "&": "&amp;",
-    "<": "&lt;",
-    ">": "&gt;",
-    '"': "&quot;",
-    "'": "&#x27;",
-    "`": "&#x60;"
-  };
-
-  var badChars = /[&<>"'`]/g;
-  var possible = /[&<>"'`]/;
-
-  function escapeChar(chr) {
-    return escape[chr] || "&amp;";
+ handlebars v2.0.0
+
+ Copyright (C) 2011-2014 by Yehuda Katz
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+ @license
+ */
+/* exported Handlebars */
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define([], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory();
+  } else {
+    root.Handlebars = root.Handlebars || factory();
   }
-
-  function extend(obj, value) {
-    for(var key in value) {
-      if(Object.prototype.hasOwnProperty.call(value, key)) {
-        obj[key] = value[key];
-      }
+}(this, function () {
+// handlebars/safe-string.js
+  var __module3__ = (function() {
+    "use strict";
+    var __exports__;
+    // Build out our basic SafeString type
+    function SafeString(string) {
+      this.string = string;
     }
-  }
 
-  __exports__.extend = extend;var toString = Object.prototype.toString;
-  __exports__.toString = toString;
-  // Sourced from lodash
-  // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
-  var isFunction = function(value) {
-    return typeof value === 'function';
-  };
-  // fallback for older versions of Chrome and Safari
-  if (isFunction(/x/)) {
-    isFunction = function(value) {
-      return typeof value === 'function' && toString.call(value) === '[object Function]';
+    SafeString.prototype.toString = function() {
+      return "" + this.string;
     };
-  }
-  var isFunction;
-  __exports__.isFunction = isFunction;
-  var isArray = Array.isArray || function(value) {
-    return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
-  };
-  __exports__.isArray = isArray;
-
-  function escapeExpression(string) {
-    // don't escape SafeStrings, since they're already safe
-    if (string instanceof SafeString) {
-      return string.toString();
-    } else if (!string && string !== 0) {
-      return "";
-    }
-
-    // Force a string conversion as this will be done by the append regardless and
-    // the regex test will do this transparently behind the scenes, causing issues if
-    // an object's to string has escaped characters in it.
-    string = "" + string;
-
-    if(!possible.test(string)) { return string; }
-    return string.replace(badChars, escapeChar);
-  }
-
-  __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
-    if (!value && value !== 0) {
-      return true;
-    } else if (isArray(value) && value.length === 0) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-
-  __exports__.isEmpty = isEmpty;
-  return __exports__;
-})(__module4__);
-
-// handlebars/exception.js
-var __module5__ = (function() {
-  "use strict";
-  var __exports__;
-
-  var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
-
-  function Exception(/* message */) {
-    var tmp = Error.prototype.constructor.apply(this, arguments);
-
-    // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
-    for (var idx = 0; idx < errorProps.length; idx++) {
-      this[errorProps[idx]] = tmp[errorProps[idx]];
-    }
-  }
-
-  Exception.prototype = new Error();
-
-  __exports__ = Exception;
-  return __exports__;
-})();
-
-// handlebars/base.js
-var __module2__ = (function(__dependency1__, __dependency2__) {
-  "use strict";
-  var __exports__ = {};
-  var Utils = __dependency1__;
-  var Exception = __dependency2__;
-
-  var VERSION = "1.2.0";
-  __exports__.VERSION = VERSION;var COMPILER_REVISION = 4;
-  __exports__.COMPILER_REVISION = COMPILER_REVISION;
-  var REVISION_CHANGES = {
-    1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-    2: '== 1.0.0-rc.3',
-    3: '== 1.0.0-rc.4',
-    4: '>= 1.0.0'
-  };
-  __exports__.REVISION_CHANGES = REVISION_CHANGES;
-  var isArray = Utils.isArray,
-      isFunction = Utils.isFunction,
-      toString = Utils.toString,
-      objectType = '[object Object]';
-
-  function HandlebarsEnvironment(helpers, partials) {
-    this.helpers = helpers || {};
-    this.partials = partials || {};
-
-    registerDefaultHelpers(this);
-  }
 
-  __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
-    constructor: HandlebarsEnvironment,
+    __exports__ = SafeString;
+    return __exports__;
+  })();
 
-    logger: logger,
-    log: log,
+// handlebars/utils.js
+  var __module2__ = (function(__dependency1__) {
+    "use strict";
+    var __exports__ = {};
+    /*jshint -W004 */
+    var SafeString = __dependency1__;
+
+    var escape = {
+      "&": "&amp;",
+      "<": "&lt;",
+      ">": "&gt;",
+      '"': "&quot;",
+      "'": "&#x27;",
+      "`": "&#x60;"
+    };
 
-    registerHelper: function(name, fn, inverse) {
-      if (toString.call(name) === objectType) {
-        if (inverse || fn) { throw new Exception('Arg not supported with multiple helpers'); }
-        Utils.extend(this.helpers, name);
-      } else {
-        if (inverse) { fn.not = inverse; }
-        this.helpers[name] = fn;
-      }
-    },
+    var badChars = /[&<>"'`]/g;
+    var possible = /[&<>"'`]/;
 
-    registerPartial: function(name, str) {
-      if (toString.call(name) === objectType) {
-        Utils.extend(this.partials,  name);
-      } else {
-        this.partials[name] = str;
-      }
+    function escapeChar(chr) {
+      return escape[chr];
     }
-  };
-
-  function registerDefaultHelpers(instance) {
-    instance.registerHelper('helperMissing', function(arg) {
-      if(arguments.length === 2) {
-        return undefined;
-      } else {
-        throw new Error("Missing helper: '" + arg + "'");
-      }
-    });
-
-    instance.registerHelper('blockHelperMissing', function(context, options) {
-      var inverse = options.inverse || function() {}, fn = options.fn;
-
-      if (isFunction(context)) { context = context.call(this); }
 
-      if(context === true) {
-        return fn(this);
-      } else if(context === false || context == null) {
-        return inverse(this);
-      } else if (isArray(context)) {
-        if(context.length > 0) {
-          return instance.helpers.each(context, options);
-        } else {
-          return inverse(this);
-        }
-      } else {
-        return fn(context);
-      }
-    });
-
-    instance.registerHelper('each', function(context, options) {
-      var fn = options.fn, inverse = options.inverse;
-      var i = 0, ret = "", data;
-
-      if (isFunction(context)) { context = context.call(this); }
-
-      if (options.data) {
-        data = createFrame(options.data);
-      }
-
-      if(context && typeof context === 'object') {
-        if (isArray(context)) {
-          for(var j = context.length; i<j; i++) {
-            if (data) {
-              data.index = i;
-              data.first = (i === 0);
-              data.last  = (i === (context.length-1));
-            }
-            ret = ret + fn(context[i], { data: data });
-          }
-        } else {
-          for(var key in context) {
-            if(context.hasOwnProperty(key)) {
-              if(data) { 
-                data.key = key; 
-                data.index = i;
-                data.first = (i === 0);
-              }
-              ret = ret + fn(context[key], {data: data});
-              i++;
-            }
+    function extend(obj /* , ...source */) {
+      for (var i = 1; i < arguments.length; i++) {
+        for (var key in arguments[i]) {
+          if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
+            obj[key] = arguments[i][key];
           }
         }
       }
 
-      if(i === 0){
-        ret = inverse(this);
-      }
-
-      return ret;
-    });
+      return obj;
+    }
 
-    instance.registerHelper('if', function(conditional, options) {
-      if (isFunction(conditional)) { conditional = conditional.call(this); }
+    __exports__.extend = extend;var toString = Object.prototype.toString;
+    __exports__.toString = toString;
+    // Sourced from lodash
+    // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
+    var isFunction = function(value) {
+      return typeof value === 'function';
+    };
+    // fallback for older versions of Chrome and Safari
+    /* istanbul ignore next */
+    if (isFunction(/x/)) {
+      isFunction = function(value) {
+        return typeof value === 'function' && toString.call(value) === '[object Function]';
+      };
+    }
+    var isFunction;
+    __exports__.isFunction = isFunction;
+    /* istanbul ignore next */
+    var isArray = Array.isArray || function(value) {
+          return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
+        };
+    __exports__.isArray = isArray;
 
-      // Default behavior is to render the positive path if the value is truthy and not empty.
-      // The `includeZero` option may be set to treat the condtional as purely not empty based on the
-      // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
-      if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
-        return options.inverse(this);
-      } else {
-        return options.fn(this);
+    function escapeExpression(string) {
+      // don't escape SafeStrings, since they're already safe
+      if (string instanceof SafeString) {
+        return string.toString();
+      } else if (string == null) {
+        return "";
+      } else if (!string) {
+        return string + '';
       }
-    });
-
-    instance.registerHelper('unless', function(conditional, options) {
-      return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
-    });
 
-    instance.registerHelper('with', function(context, options) {
-      if (isFunction(context)) { context = context.call(this); }
+      // Force a string conversion as this will be done by the append regardless and
+      // the regex test will do this transparently behind the scenes, causing issues if
+      // an object's to string has escaped characters in it.
+      string = "" + string;
 
-      if (!Utils.isEmpty(context)) return options.fn(context);
-    });
-
-    instance.registerHelper('log', function(context, options) {
-      var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-      instance.log(level, context);
-    });
-  }
-
-  var logger = {
-    methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
-
-    // State enum
-    DEBUG: 0,
-    INFO: 1,
-    WARN: 2,
-    ERROR: 3,
-    level: 3,
-
-    // can be overridden in the host environment
-    log: function(level, obj) {
-      if (logger.level <= level) {
-        var method = logger.methodMap[level];
-        if (typeof console !== 'undefined' && console[method]) {
-          console[method].call(console, obj);
-        }
-      }
+      if(!possible.test(string)) { return string; }
+      return string.replace(badChars, escapeChar);
     }
-  };
-  __exports__.logger = logger;
-  function log(level, obj) { logger.log(level, obj); }
-
-  __exports__.log = log;var createFrame = function(object) {
-    var obj = {};
-    Utils.extend(obj, object);
-    return obj;
-  };
-  __exports__.createFrame = createFrame;
-  return __exports__;
-})(__module3__, __module5__);
 
-// handlebars/runtime.js
-var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
-  "use strict";
-  var __exports__ = {};
-  var Utils = __dependency1__;
-  var Exception = __dependency2__;
-  var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
-  var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
-
-  function checkRevision(compilerInfo) {
-    var compilerRevision = compilerInfo && compilerInfo[0] || 1,
-        currentRevision = COMPILER_REVISION;
-
-    if (compilerRevision !== currentRevision) {
-      if (compilerRevision < currentRevision) {
-        var runtimeVersions = REVISION_CHANGES[currentRevision],
-            compilerVersions = REVISION_CHANGES[compilerRevision];
-        throw new Error("Template was precompiled with an older version of Handlebars than the current runtime. "+
-              "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
+    __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
+      if (!value && value !== 0) {
+        return true;
+      } else if (isArray(value) && value.length === 0) {
+        return true;
       } else {
-        // Use the embedded version info since the runtime doesn't know about this revision yet
-        throw new Error("Template was precompiled with a newer version of Handlebars than the current runtime. "+
-              "Please update your runtime to a newer version ("+compilerInfo[1]+").");
+        return false;
       }
     }
-  }
 
-  __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
-
-  function template(templateSpec, env) {
-    if (!env) {
-      throw new Error("No environment passed to template");
+    __exports__.isEmpty = isEmpty;function appendContextPath(contextPath, id) {
+      return (contextPath ? contextPath + '.' : '') + id;
     }
 
-    // Note: Using env.VM references rather than local var references throughout this section to allow
-    // for external users to override these as psuedo-supported APIs.
-    var invokePartialWrapper = function(partial, name, context, helpers, partials, data) {
-      var result = env.VM.invokePartial.apply(this, arguments);
-      if (result != null) { return result; }
+    __exports__.appendContextPath = appendContextPath;
+    return __exports__;
+  })(__module3__);
 
-      if (env.compile) {
-        var options = { helpers: helpers, partials: partials, data: data };
-        partials[name] = env.compile(partial, { data: data !== undefined }, env);
-        return partials[name](context, options);
-      } else {
-        throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
-      }
-    };
+// handlebars/exception.js
+  var __module4__ = (function() {
+    "use strict";
+    var __exports__;
 
-    // Just add water
-    var container = {
-      escapeExpression: Utils.escapeExpression,
-      invokePartial: invokePartialWrapper,
-      programs: [],
-      program: function(i, fn, data) {
-        var programWrapper = this.programs[i];
-        if(data) {
-          programWrapper = program(i, fn, data);
-        } else if (!programWrapper) {
-          programWrapper = this.programs[i] = program(i, fn);
-        }
-        return programWrapper;
-      },
-      merge: function(param, common) {
-        var ret = param || common;
+    var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
 
-        if (param && common && (param !== common)) {
-          ret = {};
-          Utils.extend(ret, common);
-          Utils.extend(ret, param);
-        }
-        return ret;
-      },
-      programWithDepth: env.VM.programWithDepth,
-      noop: env.VM.noop,
-      compilerInfo: null
-    };
-
-    return function(context, options) {
-      options = options || {};
-      var namespace = options.partial ? options : env,
-          helpers,
-          partials;
+    function Exception(message, node) {
+      var line;
+      if (node && node.firstLine) {
+        line = node.firstLine;
 
-      if (!options.partial) {
-        helpers = options.helpers;
-        partials = options.partials;
+        message += ' - ' + line + ':' + node.firstColumn;
       }
-      var result = templateSpec.call(
-            container,
-            namespace, context,
-            helpers,
-            partials,
-            options.data);
-
-      if (!options.partial) {
-        env.VM.checkRevision(container.compilerInfo);
-      }
-
-      return result;
-    };
-  }
-
-  __exports__.template = template;function programWithDepth(i, fn, data /*, $depth */) {
-    var args = Array.prototype.slice.call(arguments, 3);
-
-    var prog = function(context, options) {
-      options = options || {};
-
-      return fn.apply(this, [context, options.data || data].concat(args));
-    };
-    prog.program = i;
-    prog.depth = args.length;
-    return prog;
-  }
-
-  __exports__.programWithDepth = programWithDepth;function program(i, fn, data) {
-    var prog = function(context, options) {
-      options = options || {};
-
-      return fn(context, options.data || data);
-    };
-    prog.program = i;
-    prog.depth = 0;
-    return prog;
-  }
-
-  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data) {
-    var options = { partial: true, helpers: helpers, partials: partials, data: data };
-
-    if(partial === undefined) {
-      throw new Exception("The partial " + name + " could not be found");
-    } else if(partial instanceof Function) {
-      return partial(context, options);
-    }
-  }
 
-  __exports__.invokePartial = invokePartial;function noop() { return ""; }
+      var tmp = Error.prototype.constructor.call(this, message);
 
-  __exports__.noop = noop;
-  return __exports__;
-})(__module3__, __module5__, __module2__);
-
-// handlebars.runtime.js
-var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
-  "use strict";
-  var __exports__;
-  /*globals Handlebars: true */
-  var base = __dependency1__;
-
-  // Each of these augment the Handlebars object. No need to setup here.
-  // (This is done to easily share code between commonjs and browse envs)
-  var SafeString = __dependency2__;
-  var Exception = __dependency3__;
-  var Utils = __dependency4__;
-  var runtime = __dependency5__;
-
-  // For compatibility and usage outside of module systems, make the Handlebars object a namespace
-  var create = function() {
-    var hb = new base.HandlebarsEnvironment();
-
-    Utils.extend(hb, base);
-    hb.SafeString = SafeString;
-    hb.Exception = Exception;
-    hb.Utils = Utils;
-
-    hb.VM = runtime;
-    hb.template = function(spec) {
-      return runtime.template(spec, hb);
-    };
-
-    return hb;
-  };
-
-  var Handlebars = create();
-  Handlebars.create = create;
-
-  __exports__ = Handlebars;
-  return __exports__;
-})(__module2__, __module4__, __module5__, __module3__, __module6__);
-
-// handlebars/compiler/ast.js
-var __module7__ = (function(__dependency1__) {
-  "use strict";
-  var __exports__;
-  var Exception = __dependency1__;
-
-  var AST = {
-    ProgramNode: function(statements, inverseStrip, inverse) {
-      this.type = "program";
-      this.statements = statements;
-      this.strip = {};
-
-      if(inverse) {
-        this.inverse = new AST.ProgramNode(inverse, inverseStrip);
-        this.strip.right = inverseStrip.left;
-      } else if (inverseStrip) {
-        this.strip.left = inverseStrip.right;
-      }
-    },
-
-    MustacheNode: function(rawParams, hash, open, strip) {
-      this.type = "mustache";
-      this.hash = hash;
-      this.strip = strip;
-
-      // Open may be a string parsed from the parser or a passed boolean flag
-      if (open != null && open.charAt) {
-        // Must use charAt to support IE pre-10
-        var escapeFlag = open.charAt(3) || open.charAt(2);
-        this.escaped = escapeFlag !== '{' && escapeFlag !== '&';
-      } else {
-        this.escaped = !!open;
+      // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+      for (var idx = 0; idx < errorProps.length; idx++) {
+        this[errorProps[idx]] = tmp[errorProps[idx]];
       }
 
-      var id = this.id = rawParams[0];
-      var params = this.params = rawParams.slice(1);
-
-      // a mustache is an eligible helper if:
-      // * its id is simple (a single part, not `this` or `..`)
-      var eligibleHelper = this.eligibleHelper = id.isSimple;
-
-      // a mustache is definitely a helper if:
-      // * it is an eligible helper, and
-      // * it has at least one parameter or hash segment
-      this.isHelper = eligibleHelper && (params.length || hash);
-
-      // if a mustache is an eligible helper but not a definite
-      // helper, it is ambiguous, and will be resolved in a later
-      // pass or at runtime.
-    },
-
-    PartialNode: function(partialName, context, strip) {
-      this.type         = "partial";
-      this.partialName  = partialName;
-      this.context      = context;
-      this.strip = strip;
-    },
-
-    BlockNode: function(mustache, program, inverse, close) {
-      if(mustache.id.original !== close.path.original) {
-        throw new Exception(mustache.id.original + " doesn't match " + close.path.original);
+      if (line) {
+        this.lineNumber = line;
+        this.column = node.firstColumn;
       }
+    }
 
-      this.type = "block";
-      this.mustache = mustache;
-      this.program  = program;
-      this.inverse  = inverse;
-
-      this.strip = {
-        left: mustache.strip.left,
-        right: close.strip.right
-      };
-
-      (program || inverse).strip.left = mustache.strip.right;
-      (inverse || program).strip.right = close.strip.left;
-
-      if (inverse && !program) {
-        this.isInverse = true;
-      }
-    },
-
-    ContentNode: function(string) {
-      this.type = "content";
-      this.string = string;
-    },
-
-    HashNode: function(pairs) {
-      this.type = "hash";
-      this.pairs = pairs;
-    },
-
-    IdNode: function(parts) {
-      this.type = "ID";
+    Exception.prototype = new Error();
 
-      var original = "",
-          dig = [],
-          depth = 0;
+    __exports__ = Exception;
+    return __exports__;
+  })();
 
-      for(var i=0,l=parts.length; i<l; i++) {
-        var part = parts[i].part;
-        original += (parts[i].separator || '') + part;
+// handlebars/base.js
+  var __module1__ = (function(__dependency1__, __dependency2__) {
+    "use strict";
+    var __exports__ = {};
+    var Utils = __dependency1__;
+    var Exception = __dependency2__;
+
+    var VERSION = "2.0.0";
+    __exports__.VERSION = VERSION;var COMPILER_REVISION = 6;
+    __exports__.COMPILER_REVISION = COMPILER_REVISION;
+    var REVISION_CHANGES = {
+      1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+      2: '== 1.0.0-rc.3',
+      3: '== 1.0.0-rc.4',
+      4: '== 1.x.x',
+      5: '== 2.0.0-alpha.x',
+      6: '>= 2.0.0-beta.1'
+    };
+    __exports__.REVISION_CHANGES = REVISION_CHANGES;
+    var isArray = Utils.isArray,
+        isFunction = Utils.isFunction,
+        toString = Utils.toString,
+        objectType = '[object Object]';
 
-        if (part === ".." || part === "." || part === "this") {
-          if (dig.length > 0) { throw new Exception("Invalid path: " + original); }
-          else if (part === "..") { depth++; }
-          else { this.isScoped = true; }
-        }
-        else { dig.push(part); }
-      }
+    function HandlebarsEnvironment(helpers, partials) {
+      this.helpers = helpers || {};
+      this.partials = partials || {};
 
-      this.original = original;
-      this.parts    = dig;
-      this.string   = dig.join('.');
-      this.depth    = depth;
-
-      // an ID is simple if it only has one part, and that part is not
-      // `..` or `this`.
-      this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
-
-      this.stringModeValue = this.string;
-    },
-
-    PartialNameNode: function(name) {
-      this.type = "PARTIAL_NAME";
-      this.name = name.original;
-    },
-
-    DataNode: function(id) {
-      this.type = "DATA";
-      this.id = id;
-    },
-
-    StringNode: function(string) {
-      this.type = "STRING";
-      this.original =
-        this.string =
-        this.stringModeValue = string;
-    },
-
-    IntegerNode: function(integer) {
-      this.type = "INTEGER";
-      this.original =
-        this.integer = integer;
-      this.stringModeValue = Number(integer);
-    },
-
-    BooleanNode: function(bool) {
-      this.type = "BOOLEAN";
-      this.bool = bool;
-      this.stringModeValue = bool === "true";
-    },
-
-    CommentNode: function(comment) {
-      this.type = "comment";
-      this.comment = comment;
+      registerDefaultHelpers(this);
     }
-  };
-
-  // Must be exported as an object rather than the root of the module as the jison lexer
-  // most modify the object to operate properly.
-  __exports__ = AST;
-  return __exports__;
-})(__module5__);
-
-// handlebars/compiler/parser.js
-var __module9__ = (function() {
-  "use strict";
-  var __exports__;
-  /* jshint ignore:start */
-  /* Jison generated parser */
-  var handlebars = (function(){
-  var parser = {trace: function trace() { },
-  yy: {},
-  symbols_: {"error":2,"root":3,"statements":4,"EOF":5,"program":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"partial_option0":27,"inMustache_repetition0":28,"inMustache_option0":29,"dataName":30,"param":31,"STRING":32,"INTEGER":33,"BOOLEAN":34,"hash":35,"hash_repetition_plus0":36,"hashSegment":37,"ID":38,"EQUALS":39,"DATA":40,"pathSegments":41,"SEP":42,"$accept":0,"$end":1},
-  terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",32:"STRING",33:"INTEGER",34:"BOOLEAN",38:"ID",39:"EQUALS",40:"DATA",42:"SEP"},
-  productions_: [0,[3,2],[3,1],[6,2],[6,3],[6,2],[6,1],[6,1],[6,0],[4,1],[4,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,4],[7,2],[17,3],[17,1],[31,1],[31,1],[31,1],[31,1],[31,1],[35,1],[37,3],[26,1],[26,1],[26,1],[30,2],[21,1],[41,3],[41,1],[27,0],[27,1],[28,0],[28,2],[29,0],[29,1],[36,1],[36,2]],
-  performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-  var $0 = $$.length - 1;
-  switch (yystate) {
-  case 1: return new yy.ProgramNode($$[$0-1]); 
-  break;
-  case 2: return new yy.ProgramNode([]); 
-  break;
-  case 3:this.$ = new yy.ProgramNode([], $$[$0-1], $$[$0]);
-  break;
-  case 4:this.$ = new yy.ProgramNode($$[$0-2], $$[$0-1], $$[$0]);
-  break;
-  case 5:this.$ = new yy.ProgramNode($$[$0-1], $$[$0], []);
-  break;
-  case 6:this.$ = new yy.ProgramNode($$[$0]);
-  break;
-  case 7:this.$ = new yy.ProgramNode([]);
-  break;
-  case 8:this.$ = new yy.ProgramNode([]);
-  break;
-  case 9:this.$ = [$$[$0]];
-  break;
-  case 10: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
-  break;
-  case 11:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]);
-  break;
-  case 12:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]);
-  break;
-  case 13:this.$ = $$[$0];
-  break;
-  case 14:this.$ = $$[$0];
-  break;
-  case 15:this.$ = new yy.ContentNode($$[$0]);
-  break;
-  case 16:this.$ = new yy.CommentNode($$[$0]);
-  break;
-  case 17:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
-  break;
-  case 18:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
-  break;
-  case 19:this.$ = {path: $$[$0-1], strip: stripFlags($$[$0-2], $$[$0])};
-  break;
-  case 20:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
-  break;
-  case 21:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
-  break;
-  case 22:this.$ = new yy.PartialNode($$[$0-2], $$[$0-1], stripFlags($$[$0-3], $$[$0]));
-  break;
-  case 23:this.$ = stripFlags($$[$0-1], $$[$0]);
-  break;
-  case 24:this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]];
-  break;
-  case 25:this.$ = [[$$[$0]], null];
-  break;
-  case 26:this.$ = $$[$0];
-  break;
-  case 27:this.$ = new yy.StringNode($$[$0]);
-  break;
-  case 28:this.$ = new yy.IntegerNode($$[$0]);
-  break;
-  case 29:this.$ = new yy.BooleanNode($$[$0]);
-  break;
-  case 30:this.$ = $$[$0];
-  break;
-  case 31:this.$ = new yy.HashNode($$[$0]);
-  break;
-  case 32:this.$ = [$$[$0-2], $$[$0]];
-  break;
-  case 33:this.$ = new yy.PartialNameNode($$[$0]);
-  break;
-  case 34:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0]));
-  break;
-  case 35:this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0]));
-  break;
-  case 36:this.$ = new yy.DataNode($$[$0]);
-  break;
-  case 37:this.$ = new yy.IdNode($$[$0]);
-  break;
-  case 38: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
-  break;
-  case 39:this.$ = [{part: $$[$0]}];
-  break;
-  case 42:this.$ = [];
-  break;
-  case 43:$$[$0-1].push($$[$0]);
-  break;
-  case 46:this.$ = [$$[$0]];
-  break;
-  case 47:$$[$0-1].push($$[$0]);
-  break;
-  }
-  },
-  table: [{3:1,4:2,5:[1,3],8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[3]},{5:[1,16],8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[2,2]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{4:20,6:18,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{4:20,6:22,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{17:23,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:29,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:30,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:31,21:24,30:25,38:[1,28],40:[1,27],41:26},{21:33,26:32,32:[1,34],33:[1,35],38:[1,28],41:26},{1:[2,1]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{10:36,20:[1,37]},{4:38,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,7],22:[1,13],23:[1,14],25:[1,15]},{7:39,8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,6],22:[1,13],23:[1,14],25:[1,15]},{17:23,18:[1,40],21:24,30:25,38:[1,28],40:[1,27],41:26},{10:41,20:[1,37]},{18:[1,42]},{18:[2,42],24:[2,42],28:43,32:[2,42],33:[2,42],34:[2,42],38:[2,42],40:[2,42]},{18:[2,25],24:[2,25]},{18:[2,37],24:[2,37],32:[2,37],33:[2,37],34:[2,37],38:[2,37],40:[2,37],42:[1,44]},{21:45,38:[1,28],41:26},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],38:[2,39],40:[2,39],42:[2,39]},{18:[1,46]},{18:[1,47]},{24:[1,48]},{18:[2,40],21:50,27:49,38:[1,28],41:26},{18:[2,33],38:[2,33]},{18:[2,34],38:[2,34]},{18:[2,35],38:[2,35]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{21:51,38:[1,28],41:26},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,3],22:[1,13],23:[1,14],25:[1,15]},{4:52,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,5],22:[1,13],23:[1,14],25:[1,15]},{14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]},{18:[2,44],21:56,24:[2,44],29:53,30:60,31:54,32:[1,57],33:[1,58],34:[1,59],35:55,36:61,37:62,38:[1,63],40:[1,27],41:26},{38:[1,64]},{18:[2,36],24:[2,36],32:[2,36],33:[2,36],34:[2,36],38:[2,36],40:[2,36]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,65]},{18:[2,41]},{18:[1,66]},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],25:[1,15]},{18:[2,24],24:[2,24]},{18:[2,43],24:[2,43],32:[2,43],33:[2,43],34:[2,43],38:[2,43],40:[2,43]},{18:[2,45],24:[2,45]},{18:[2,26],24:[2,26],32:[2,26],33:[2,26],34:[2,26],38:[2,26],40:[2,26]},{18:[2,27],24:[2,27],32:[2,27],33:[2,27],34:[2,27],38:[2,27],40:[2,27]},{18:[2,28],24:[2,28],32:[2,28],33:[2,28],34:[2,28],38:[2,28],40:[2,28]},{18:[2,29],24:[2,29],32:[2,29],33:[2,29],34:[2,29],38:[2,29],40:[2,29]},{18:[2,30],24:[2,30],32:[2,30],33:[2,30],34:[2,30],38:[2,30],40:[2,30]},{18:[2,31],24:[2,31],37:67,38:[1,68]},{18:[2,46],24:[2,46],38:[2,46]},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],38:[2,39],39:[1,69],40:[2,39],42:[2,39]},{18:[2,38],24:[2,38],32:[2,38],33:[2,38],34:[2,38],38:[2,38],40:[2,38],42:[2,38]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{18:[2,47],24:[2,47],38:[2,47]},{39:[1,69]},{21:56,30:60,31:70,32:[1,57],33:[1,58],34:[1,59],38:[1,28],40:[1,27],41:26},{18:[2,32],24:[2,32],38:[2,32]}],
-  defaultActions: {3:[2,2],16:[2,1],50:[2,41]},
-  parseError: function parseError(str, hash) {
-      throw new Error(str);
-  },
-  parse: function parse(input) {
-      var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-      this.lexer.setInput(input);
-      this.lexer.yy = this.yy;
-      this.yy.lexer = this.lexer;
-      this.yy.parser = this;
-      if (typeof this.lexer.yylloc == "undefined")
-          this.lexer.yylloc = {};
-      var yyloc = this.lexer.yylloc;
-      lstack.push(yyloc);
-      var ranges = this.lexer.options && this.lexer.options.ranges;
-      if (typeof this.yy.parseError === "function")
-          this.parseError = this.yy.parseError;
-      function popStack(n) {
-          stack.length = stack.length - 2 * n;
-          vstack.length = vstack.length - n;
-          lstack.length = lstack.length - n;
-      }
-      function lex() {
-          var token;
-          token = self.lexer.lex() || 1;
-          if (typeof token !== "number") {
-              token = self.symbols_[token] || token;
-          }
-          return token;
-      }
-      var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-      while (true) {
-          state = stack[stack.length - 1];
-          if (this.defaultActions[state]) {
-              action = this.defaultActions[state];
-          } else {
-              if (symbol === null || typeof symbol == "undefined") {
-                  symbol = lex();
-              }
-              action = table[state] && table[state][symbol];
-          }
-          if (typeof action === "undefined" || !action.length || !action[0]) {
-              var errStr = "";
-              if (!recovering) {
-                  expected = [];
-                  for (p in table[state])
-                      if (this.terminals_[p] && p > 2) {
-                          expected.push("'" + this.terminals_[p] + "'");
-                      }
-                  if (this.lexer.showPosition) {
-                      errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
-                  } else {
-                      errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                  }
-                  this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-              }
-          }
-          if (action[0] instanceof Array && action.length > 1) {
-              throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-          }
-          switch (action[0]) {
-          case 1:
-              stack.push(symbol);
-              vstack.push(this.lexer.yytext);
-              lstack.push(this.lexer.yylloc);
-              stack.push(action[1]);
-              symbol = null;
-              if (!preErrorSymbol) {
-                  yyleng = this.lexer.yyleng;
-                  yytext = this.lexer.yytext;
-                  yylineno = this.lexer.yylineno;
-                  yyloc = this.lexer.yylloc;
-                  if (recovering > 0)
-                      recovering--;
-              } else {
-                  symbol = preErrorSymbol;
-                  preErrorSymbol = null;
-              }
-              break;
-          case 2:
-              len = this.productions_[action[1]][1];
-              yyval.$ = vstack[vstack.length - len];
-              yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-              if (ranges) {
-                  yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
-              }
-              r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-              if (typeof r !== "undefined") {
-                  return r;
-              }
-              if (len) {
-                  stack = stack.slice(0, -1 * len * 2);
-                  vstack = vstack.slice(0, -1 * len);
-                  lstack = lstack.slice(0, -1 * len);
-              }
-              stack.push(this.productions_[action[1]][0]);
-              vstack.push(yyval.$);
-              lstack.push(yyval._$);
-              newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-              stack.push(newState);
-              break;
-          case 3:
-              return true;
-          }
-      }
-      return true;
-  }
-  };
 
+    __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
+      constructor: HandlebarsEnvironment,
 
-  function stripFlags(open, close) {
-    return {
-      left: open.charAt(2) === '~',
-      right: close.charAt(0) === '~' || close.charAt(1) === '~'
-    };
-  }
+      logger: logger,
+      log: log,
 
-  /* Jison generated lexer */
-  var lexer = (function(){
-  var lexer = ({EOF:1,
-  parseError:function parseError(str, hash) {
-          if (this.yy.parser) {
-              this.yy.parser.parseError(str, hash);
-          } else {
-              throw new Error(str);
-          }
-      },
-  setInput:function (input) {
-          this._input = input;
-          this._more = this._less = this.done = false;
-          this.yylineno = this.yyleng = 0;
-          this.yytext = this.matched = this.match = '';
-          this.conditionStack = ['INITIAL'];
-          this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
-          if (this.options.ranges) this.yylloc.range = [0,0];
-          this.offset = 0;
-          return this;
-      },
-  input:function () {
-          var ch = this._input[0];
-          this.yytext += ch;
-          this.yyleng++;
-          this.offset++;
-          this.match += ch;
-          this.matched += ch;
-          var lines = ch.match(/(?:\r\n?|\n).*/g);
-          if (lines) {
-              this.yylineno++;
-              this.yylloc.last_line++;
-          } else {
-              this.yylloc.last_column++;
-          }
-          if (this.options.ranges) this.yylloc.range[1]++;
-
-          this._input = this._input.slice(1);
-          return ch;
-      },
-  unput:function (ch) {
-          var len = ch.length;
-          var lines = ch.split(/(?:\r\n?|\n)/g);
-
-          this._input = ch + this._input;
-          this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
-          //this.yyleng -= len;
-          this.offset -= len;
-          var oldLines = this.match.split(/(?:\r\n?|\n)/g);
-          this.match = this.match.substr(0, this.match.length-1);
-          this.matched = this.matched.substr(0, this.matched.length-1);
-
-          if (lines.length-1) this.yylineno -= lines.length-1;
-          var r = this.yylloc.range;
-
-          this.yylloc = {first_line: this.yylloc.first_line,
-            last_line: this.yylineno+1,
-            first_column: this.yylloc.first_column,
-            last_column: lines ?
-                (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
-                this.yylloc.first_column - len
-            };
-
-          if (this.options.ranges) {
-              this.yylloc.range = [r[0], r[0] + this.yyleng - len];
-          }
-          return this;
-      },
-  more:function () {
-          this._more = true;
-          return this;
-      },
-  less:function (n) {
-          this.unput(this.match.slice(n));
-      },
-  pastInput:function () {
-          var past = this.matched.substr(0, this.matched.length - this.match.length);
-          return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
-      },
-  upcomingInput:function () {
-          var next = this.match;
-          if (next.length < 20) {
-              next += this._input.substr(0, 20-next.length);
-          }
-          return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
-      },
-  showPosition:function () {
-          var pre = this.pastInput();
-          var c = new Array(pre.length + 1).join("-");
-          return pre + this.upcomingInput() + "\n" + c+"^";
-      },
-  next:function () {
-          if (this.done) {
-              return this.EOF;
-          }
-          if (!this._input) this.done = true;
-
-          var token,
-              match,
-              tempMatch,
-              index,
-              col,
-              lines;
-          if (!this._more) {
-              this.yytext = '';
-              this.match = '';
-          }
-          var rules = this._currentRules();
-          for (var i=0;i < rules.length; i++) {
-              tempMatch = this._input.match(this.rules[rules[i]]);
-              if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
-                  match = tempMatch;
-                  index = i;
-                  if (!this.options.flex) break;
-              }
-          }
-          if (match) {
-              lines = match[0].match(/(?:\r\n?|\n).*/g);
-              if (lines) this.yylineno += lines.length;
-              this.yylloc = {first_line: this.yylloc.last_line,
-                             last_line: this.yylineno+1,
-                             first_column: this.yylloc.last_column,
-                             last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
-              this.yytext += match[0];
-              this.match += match[0];
-              this.matches = match;
-              this.yyleng = this.yytext.length;
-              if (this.options.ranges) {
-                  this.yylloc.range = [this.offset, this.offset += this.yyleng];
-              }
-              this._more = false;
-              this._input = this._input.slice(match[0].length);
-              this.matched += match[0];
-              token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
-              if (this.done && this._input) this.done = false;
-              if (token) return token;
-              else return;
-          }
-          if (this._input === "") {
-              return this.EOF;
-          } else {
-              return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
-                      {text: "", token: null, line: this.yylineno});
-          }
-      },
-  lex:function lex() {
-          var r = this.next();
-          if (typeof r !== 'undefined') {
-              return r;
-          } else {
-              return this.lex();
-          }
-      },
-  begin:function begin(condition) {
-          this.conditionStack.push(condition);
-      },
-  popState:function popState() {
-          return this.conditionStack.pop();
-      },
-  _currentRules:function _currentRules() {
-          return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
+      registerHelper: function(name, fn) {
+        if (toString.call(name) === objectType) {
+          if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
+          Utils.extend(this.helpers, name);
+        } else {
+          this.helpers[name] = fn;
+        }
       },
-  topState:function () {
-          return this.conditionStack[this.conditionStack.length-2];
+      unregisterHelper: function(name) {
+        delete this.helpers[name];
       },
-  pushState:function begin(condition) {
-          this.begin(condition);
-      }});
-  lexer.options = {};
-  lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
-
-
-  function strip(start, end) {
-    return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end);
-  }
-
-
-  var YYSTATE=YY_START
-  switch($avoiding_name_collisions) {
-  case 0:
-                                     if(yy_.yytext.slice(-2) === "\\\\") {
-                                       strip(0,1);
-                                       this.begin("mu");
-                                     } else if(yy_.yytext.slice(-1) === "\\") {
-                                       strip(0,1);
-                                       this.begin("emu");
-                                     } else {
-                                       this.begin("mu");
-                                     }
-                                     if(yy_.yytext) return 14;
-                                   
-  break;
-  case 1:return 14;
-  break;
-  case 2:
-                                     this.popState();
-                                     return 14;
-                                   
-  break;
-  case 3:strip(0,4); this.popState(); return 15;
-  break;
-  case 4:return 25;
-  break;
-  case 5:return 16;
-  break;
-  case 6:return 20;
-  break;
-  case 7:return 19;
-  break;
-  case 8:return 19;
-  break;
-  case 9:return 23;
-  break;
-  case 10:return 22;
-  break;
-  case 11:this.popState(); this.begin('com');
-  break;
-  case 12:strip(3,5); this.popState(); return 15;
-  break;
-  case 13:return 22;
-  break;
-  case 14:return 39;
-  break;
-  case 15:return 38;
-  break;
-  case 16:return 38;
-  break;
-  case 17:return 42;
-  break;
-  case 18:// ignore whitespace
-  break;
-  case 19:this.popState(); return 24;
-  break;
-  case 20:this.popState(); return 18;
-  break;
-  case 21:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 32;
-  break;
-  case 22:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 32;
-  break;
-  case 23:return 40;
-  break;
-  case 24:return 34;
-  break;
-  case 25:return 34;
-  break;
-  case 26:return 33;
-  break;
-  case 27:return 38;
-  break;
-  case 28:yy_.yytext = strip(1,2); return 38;
-  break;
-  case 29:return 'INVALID';
-  break;
-  case 30:return 5;
-  break;
-  }
-  };
-  lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s])))/,/^(?:false(?=([~}\s])))/,/^(?:-?[0-9]+(?=([~}\s])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-  lexer.conditions = {"mu":{"rules":[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[3],"inclusive":false},"INITIAL":{"rules":[0,1,30],"inclusive":true}};
-  return lexer;})()
-  parser.lexer = lexer;
-  function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
-  return new Parser;
-  })();__exports__ = handlebars;
-  /* jshint ignore:end */
-  return __exports__;
-})();
-
-// handlebars/compiler/base.js
-var __module8__ = (function(__dependency1__, __dependency2__) {
-  "use strict";
-  var __exports__ = {};
-  var parser = __dependency1__;
-  var AST = __dependency2__;
-
-  __exports__.parser = parser;
-
-  function parse(input) {
-    // Just return if an already-compile AST was passed in.
-    if(input.constructor === AST.ProgramNode) { return input; }
-
-    parser.yy = AST;
-    return parser.parse(input);
-  }
 
-  __exports__.parse = parse;
-  return __exports__;
-})(__module9__, __module7__);
-
-// handlebars/compiler/javascript-compiler.js
-var __module11__ = (function(__dependency1__) {
-  "use strict";
-  var __exports__;
-  var COMPILER_REVISION = __dependency1__.COMPILER_REVISION;
-  var REVISION_CHANGES = __dependency1__.REVISION_CHANGES;
-  var log = __dependency1__.log;
-
-  function Literal(value) {
-    this.value = value;
-  }
-
-  function JavaScriptCompiler() {}
-
-  JavaScriptCompiler.prototype = {
-    // PUBLIC API: You can override these methods in a subclass to provide
-    // alternative compiled forms for name lookup and buffering semantics
-    nameLookup: function(parent, name /* , type*/) {
-      var wrap,
-          ret;
-      if (parent.indexOf('depth') === 0) {
-        wrap = true;
-      }
-
-      if (/^[0-9]+$/.test(name)) {
-        ret = parent + "[" + name + "]";
-      } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-        ret = parent + "." + name;
-      }
-      else {
-        ret = parent + "['" + name + "']";
-      }
-
-      if (wrap) {
-        return '(' + parent + ' && ' + ret + ')';
-      } else {
-        return ret;
-      }
-    },
-
-    compilerInfo: function() {
-      var revision = COMPILER_REVISION,
-          versions = REVISION_CHANGES[revision];
-      return "this.compilerInfo = ["+revision+",'"+versions+"'];\n";
-    },
-
-    appendToBuffer: function(string) {
-      if (this.environment.isSimple) {
-        return "return " + string + ";";
-      } else {
-        return {
-          appendToBuffer: true,
-          content: string,
-          toString: function() { return "buffer += " + string + ";"; }
-        };
-      }
-    },
-
-    initializeBuffer: function() {
-      return this.quotedString("");
-    },
-
-    namespace: "Handlebars",
-    // END PUBLIC API
-
-    compile: function(environment, options, context, asObject) {
-      this.environment = environment;
-      this.options = options || {};
-
-      log('debug', this.environment.disassemble() + "\n\n");
-
-      this.name = this.environment.name;
-      this.isChild = !!context;
-      this.context = context || {
-        programs: [],
-        environments: [],
-        aliases: { }
-      };
-
-      this.preamble();
-
-      this.stackSlot = 0;
-      this.stackVars = [];
-      this.registers = { list: [] };
-      this.compileStack = [];
-      this.inlineStack = [];
-
-      this.compileChildren(environment, options);
-
-      var opcodes = environment.opcodes, opcode;
-
-      this.i = 0;
-
-      for(var l=opcodes.length; this.i<l; this.i++) {
-        opcode = opcodes[this.i];
-
-        if(opcode.opcode === 'DECLARE') {
-          this[opcode.name] = opcode.value;
+      registerPartial: function(name, partial) {
+        if (toString.call(name) === objectType) {
+          Utils.extend(this.partials,  name);
         } else {
-          this[opcode.opcode].apply(this, opcode.args);
-        }
-
-        // Reset the stripNext flag if it was not set by this operation.
-        if (opcode.opcode !== this.stripNext) {
-          this.stripNext = false;
+          this.partials[name] = partial;
         }
+      },
+      unregisterPartial: function(name) {
+        delete this.partials[name];
       }
+    };
 
-      // Flush any trailing content that might be pending.
-      this.pushSource('');
-
-      return this.createFunctionContext(asObject);
-    },
-
-    preamble: function() {
-      var out = [];
-
-      if (!this.isChild) {
-        var namespace = this.namespace;
-
-        var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
-        if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
-        if (this.options.data) { copies = copies + " data = data || {};"; }
-        out.push(copies);
-      } else {
-        out.push('');
-      }
-
-      if (!this.environment.isSimple) {
-        out.push(", buffer = " + this.initializeBuffer());
-      } else {
-        out.push("");
-      }
-
-      // track the last context pushed into place to allow skipping the
-      // getContext opcode when it would be a noop
-      this.lastContext = 0;
-      this.source = out;
-    },
-
-    createFunctionContext: function(asObject) {
-      var locals = this.stackVars.concat(this.registers.list);
-
-      if(locals.length > 0) {
-        this.source[1] = this.source[1] + ", " + locals.join(", ");
-      }
-
-      // Generate minimizer alias mappings
-      if (!this.isChild) {
-        for (var alias in this.context.aliases) {
-          if (this.context.aliases.hasOwnProperty(alias)) {
-            this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
-          }
+    function registerDefaultHelpers(instance) {
+      instance.registerHelper('helperMissing', function(/* [args, ]options */) {
+        if(arguments.length === 1) {
+          // A missing field in a {{foo}} constuct.
+          return undefined;
+        } else {
+          // Someone is actually trying to call something, blow up.
+          throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'");
         }
-      }
-
-      if (this.source[1]) {
-        this.source[1] = "var " + this.source[1].substring(2) + ";";
-      }
-
-      // Merge children
-      if (!this.isChild) {
-        this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
-      }
-
-      if (!this.environment.isSimple) {
-        this.pushSource("return buffer;");
-      }
-
-      var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
-
-      for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
-        params.push("depth" + this.environment.depths.list[i]);
-      }
-
-      // Perform a second pass over the output to merge content when possible
-      var source = this.mergeSource();
+      });
 
-      if (!this.isChild) {
-        source = this.compilerInfo()+source;
-      }
+      instance.registerHelper('blockHelperMissing', function(context, options) {
+        var inverse = options.inverse,
+            fn = options.fn;
 
-      if (asObject) {
-        params.push(source);
+        if(context === true) {
+          return fn(this);
+        } else if(context === false || context == null) {
+          return inverse(this);
+        } else if (isArray(context)) {
+          if(context.length > 0) {
+            if (options.ids) {
+              options.ids = [options.name];
+            }
 
-        return Function.apply(this, params);
-      } else {
-        var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
-        log('debug', functionSource + "\n\n");
-        return functionSource;
-      }
-    },
-    mergeSource: function() {
-      // WARN: We are not handling the case where buffer is still populated as the source should
-      // not have buffer append operations as their final action.
-      var source = '',
-          buffer;
-      for (var i = 0, len = this.source.length; i < len; i++) {
-        var line = this.source[i];
-        if (line.appendToBuffer) {
-          if (buffer) {
-            buffer = buffer + '\n    + ' + line.content;
+            return instance.helpers.each(context, options);
           } else {
-            buffer = line.content;
+            return inverse(this);
           }
         } else {
-          if (buffer) {
-            source += 'buffer += ' + buffer + ';\n  ';
-            buffer = undefined;
+          if (options.data && options.ids) {
+            var data = createFrame(options.data);
+            data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
+            options = {data: data};
           }
-          source += line + '\n  ';
-        }
-      }
-      return source;
-    },
-
-    // [blockValue]
-    //
-    // On stack, before: hash, inverse, program, value
-    // On stack, after: return value of blockHelperMissing
-    //
-    // The purpose of this opcode is to take a block of the form
-    // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
-    // replace it on the stack with the result of properly
-    // invoking blockHelperMissing.
-    blockValue: function() {
-      this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-      var params = ["depth0"];
-      this.setupParams(0, params);
-
-      this.replaceStack(function(current) {
-        params.splice(1, 0, current);
-        return "blockHelperMissing.call(" + params.join(", ") + ")";
-      });
-    },
-
-    // [ambiguousBlockValue]
-    //
-    // On stack, before: hash, inverse, program, value
-    // Compiler value, before: lastHelper=value of last found helper, if any
-    // On stack, after, if no lastHelper: same as [blockValue]
-    // On stack, after, if lastHelper: value
-    ambiguousBlockValue: function() {
-      this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
-
-      var params = ["depth0"];
-      this.setupParams(0, params);
-
-      var current = this.topStack();
-      params.splice(1, 0, current);
-
-      // Use the options value generated from the invocation
-      params[params.length-1] = 'options';
-
-      this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
-    },
-
-    // [appendContent]
-    //
-    // On stack, before: ...
-    // On stack, after: ...
-    //
-    // Appends the string value of `content` to the current buffer
-    appendContent: function(content) {
-      if (this.pendingContent) {
-        content = this.pendingContent + content;
-      }
-      if (this.stripNext) {
-        content = content.replace(/^\s+/, '');
-      }
 
-      this.pendingContent = content;
-    },
-
-    // [strip]
-    //
-    // On stack, before: ...
-    // On stack, after: ...
-    //
-    // Removes any trailing whitespace from the prior content node and flags
-    // the next operation for stripping if it is a content node.
-    strip: function() {
-      if (this.pendingContent) {
-        this.pendingContent = this.pendingContent.replace(/\s+$/, '');
-      }
-      this.stripNext = 'strip';
-    },
-
-    // [append]
-    //
-    // On stack, before: value, ...
-    // On stack, after: ...
-    //
-    // Coerces `value` to a String and appends it to the current buffer.
-    //
-    // If `value` is truthy, or 0, it is coerced into a string and appended
-    // Otherwise, the empty string is appended
-    append: function() {
-      // Force anything that is inlined onto the stack so we don't have duplication
-      // when we examine local
-      this.flushInline();
-      var local = this.popStack();
-      this.pushSource("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
-      if (this.environment.isSimple) {
-        this.pushSource("else { " + this.appendToBuffer("''") + " }");
-      }
-    },
-
-    // [appendEscaped]
-    //
-    // On stack, before: value, ...
-    // On stack, after: ...
-    //
-    // Escape `value` and append it to the buffer
-    appendEscaped: function() {
-      this.context.aliases.escapeExpression = 'this.escapeExpression';
-
-      this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
-    },
-
-    // [getContext]
-    //
-    // On stack, before: ...
-    // On stack, after: ...
-    // Compiler value, after: lastContext=depth
-    //
-    // Set the value of the `lastContext` compiler value to the depth
-    getContext: function(depth) {
-      if(this.lastContext !== depth) {
-        this.lastContext = depth;
-      }
-    },
-
-    // [lookupOnContext]
-    //
-    // On stack, before: ...
-    // On stack, after: currentContext[name], ...
-    //
-    // Looks up the value of `name` on the current context and pushes
-    // it onto the stack.
-    lookupOnContext: function(name) {
-      this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
-    },
-
-    // [pushContext]
-    //
-    // On stack, before: ...
-    // On stack, after: currentContext, ...
-    //
-    // Pushes the value of the current context onto the stack.
-    pushContext: function() {
-      this.pushStackLiteral('depth' + this.lastContext);
-    },
-
-    // [resolvePossibleLambda]
-    //
-    // On stack, before: value, ...
-    // On stack, after: resolved value, ...
-    //
-    // If the `value` is a lambda, replace it on the stack by
-    // the return value of the lambda
-    resolvePossibleLambda: function() {
-      this.context.aliases.functionType = '"function"';
-
-      this.replaceStack(function(current) {
-        return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
-      });
-    },
-
-    // [lookup]
-    //
-    // On stack, before: value, ...
-    // On stack, after: value[name], ...
-    //
-    // Replace the value on the stack with the result of looking
-    // up `name` on `value`
-    lookup: function(name) {
-      this.replaceStack(function(current) {
-        return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
-      });
-    },
-
-    // [lookupData]
-    //
-    // On stack, before: ...
-    // On stack, after: data, ...
-    //
-    // Push the data lookup operator
-    lookupData: function() {
-      this.push('data');
-    },
-
-    // [pushStringParam]
-    //
-    // On stack, before: ...
-    // On stack, after: string, currentContext, ...
-    //
-    // This opcode is designed for use in string mode, which
-    // provides the string value of a parameter along with its
-    // depth rather than resolving it immediately.
-    pushStringParam: function(string, type) {
-      this.pushStackLiteral('depth' + this.lastContext);
-
-      this.pushString(type);
-
-      if (typeof string === 'string') {
-        this.pushString(string);
-      } else {
-        this.pushStackLiteral(string);
-      }
-    },
-
-    emptyHash: function() {
-      this.pushStackLiteral('{}');
-
-      if (this.options.stringParams) {
-        this.register('hashTypes', '{}');
-        this.register('hashContexts', '{}');
-      }
-    },
-    pushHash: function() {
-      this.hash = {values: [], types: [], contexts: []};
-    },
-    popHash: function() {
-      var hash = this.hash;
-      this.hash = undefined;
-
-      if (this.options.stringParams) {
-        this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
-        this.register('hashTypes', '{' + hash.types.join(',') + '}');
-      }
-      this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
-    },
-
-    // [pushString]
-    //
-    // On stack, before: ...
-    // On stack, after: quotedString(string), ...
-    //
-    // Push a quoted version of `string` onto the stack
-    pushString: function(string) {
-      this.pushStackLiteral(this.quotedString(string));
-    },
-
-    // [push]
-    //
-    // On stack, before: ...
-    // On stack, after: expr, ...
-    //
-    // Push an expression onto the stack
-    push: function(expr) {
-      this.inlineStack.push(expr);
-      return expr;
-    },
-
-    // [pushLiteral]
-    //
-    // On stack, before: ...
-    // On stack, after: value, ...
-    //
-    // Pushes a value onto the stack. This operation prevents
-    // the compiler from creating a temporary variable to hold
-    // it.
-    pushLiteral: function(value) {
-      this.pushStackLiteral(value);
-    },
-
-    // [pushProgram]
-    //
-    // On stack, before: ...
-    // On stack, after: program(guid), ...
-    //
-    // Push a program expression onto the stack. This takes
-    // a compile-time guid and converts it into a runtime-accessible
-    // expression.
-    pushProgram: function(guid) {
-      if (guid != null) {
-        this.pushStackLiteral(this.programExpression(guid));
-      } else {
-        this.pushStackLiteral(null);
-      }
-    },
-
-    // [invokeHelper]
-    //
-    // On stack, before: hash, inverse, program, params..., ...
-    // On stack, after: result of helper invocation
-    //
-    // Pops off the helper's parameters, invokes the helper,
-    // and pushes the helper's return value onto the stack.
-    //
-    // If the helper is not found, `helperMissing` is called.
-    invokeHelper: function(paramSize, name) {
-      this.context.aliases.helperMissing = 'helpers.helperMissing';
-
-      var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
-      var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-
-      this.push(helper.name + ' || ' + nonHelper);
-      this.replaceStack(function(name) {
-        return name + ' ? ' + name + '.call(' +
-            helper.callParams + ") " + ": helperMissing.call(" +
-            helper.helperMissingParams + ")";
+          return fn(context, options);
+        }
       });
-    },
-
-    // [invokeKnownHelper]
-    //
-    // On stack, before: hash, inverse, program, params..., ...
-    // On stack, after: result of helper invocation
-    //
-    // This operation is used when the helper is known to exist,
-    // so a `helperMissing` fallback is not required.
-    invokeKnownHelper: function(paramSize, name) {
-      var helper = this.setupHelper(paramSize, name);
-      this.push(helper.name + ".call(" + helper.callParams + ")");
-    },
-
-    // [invokeAmbiguous]
-    //
-    // On stack, before: hash, inverse, program, params..., ...
-    // On stack, after: result of disambiguation
-    //
-    // This operation is used when an expression like `{{foo}}`
-    // is provided, but we don't know at compile-time whether it
-    // is a helper or a path.
-    //
-    // This operation emits more code than the other options,
-    // and can be avoided by passing the `knownHelpers` and
-    // `knownHelpersOnly` flags at compile-time.
-    invokeAmbiguous: function(name, helperCall) {
-      this.context.aliases.functionType = '"function"';
-
-      this.pushStackLiteral('{}');    // Hash value
-      var helper = this.setupHelper(0, name, helperCall);
-
-      var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
-
-      var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-      var nextStack = this.nextStack();
-
-      this.pushSource('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }');
-      this.pushSource('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.call(' + helper.callParams + ') : ' + nextStack + '; }');
-    },
-
-    // [invokePartial]
-    //
-    // On stack, before: context, ...
-    // On stack after: result of partial invocation
-    //
-    // This operation pops off a context, invokes a partial with that context,
-    // and pushes the result of the invocation back.
-    invokePartial: function(name) {
-      var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
-
-      if (this.options.data) {
-        params.push("data");
-      }
-
-      this.context.aliases.self = "this";
-      this.push("self.invokePartial(" + params.join(", ") + ")");
-    },
-
-    // [assignToHash]
-    //
-    // On stack, before: value, hash, ...
-    // On stack, after: hash, ...
-    //
-    // Pops a value and hash off the stack, assigns `hash[key] = value`
-    // and pushes the hash back onto the stack.
-    assignToHash: function(key) {
-      var value = this.popStack(),
-          context,
-          type;
-
-      if (this.options.stringParams) {
-        type = this.popStack();
-        context = this.popStack();
-      }
-
-      var hash = this.hash;
-      if (context) {
-        hash.contexts.push("'" + key + "': " + context);
-      }
-      if (type) {
-        hash.types.push("'" + key + "': " + type);
-      }
-      hash.values.push("'" + key + "': (" + value + ")");
-    },
-
-    // HELPERS
-
-    compiler: JavaScriptCompiler,
 
-    compileChildren: function(environment, options) {
-      var children = environment.children, child, compiler;
-
-      for(var i=0, l=children.length; i<l; i++) {
-        child = children[i];
-        compiler = new this.compiler();
-
-        var index = this.matchExistingProgram(child);
-
-        if (index == null) {
-          this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
-          index = this.context.programs.length;
-          child.index = index;
-          child.name = 'program' + index;
-          this.context.programs[index] = compiler.compile(child, options, this.context);
-          this.context.environments[index] = child;
-        } else {
-          child.index = index;
-          child.name = 'program' + index;
+      instance.registerHelper('each', function(context, options) {
+        if (!options) {
+          throw new Exception('Must pass iterator to #each');
         }
-      }
-    },
-    matchExistingProgram: function(child) {
-      for (var i = 0, len = this.context.environments.length; i < len; i++) {
-        var environment = this.context.environments[i];
-        if (environment && environment.equals(child)) {
-          return i;
-        }
-      }
-    },
-
-    programExpression: function(guid) {
-      this.context.aliases.self = "this";
-
-      if(guid == null) {
-        return "self.noop";
-      }
-
-      var child = this.environment.children[guid],
-          depths = child.depths.list, depth;
-
-      var programParams = [child.index, child.name, "data"];
 
-      for(var i=0, l = depths.length; i<l; i++) {
-        depth = depths[i];
-
-        if(depth === 1) { programParams.push("depth0"); }
-        else { programParams.push("depth" + (depth - 1)); }
-      }
-
-      return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
-    },
-
-    register: function(name, val) {
-      this.useRegister(name);
-      this.pushSource(name + " = " + val + ";");
-    },
-
-    useRegister: function(name) {
-      if(!this.registers[name]) {
-        this.registers[name] = true;
-        this.registers.list.push(name);
-      }
-    },
-
-    pushStackLiteral: function(item) {
-      return this.push(new Literal(item));
-    },
-
-    pushSource: function(source) {
-      if (this.pendingContent) {
-        this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent)));
-        this.pendingContent = undefined;
-      }
-
-      if (source) {
-        this.source.push(source);
-      }
-    },
-
-    pushStack: function(item) {
-      this.flushInline();
-
-      var stack = this.incrStack();
-      if (item) {
-        this.pushSource(stack + " = " + item + ";");
-      }
-      this.compileStack.push(stack);
-      return stack;
-    },
-
-    replaceStack: function(callback) {
-      var prefix = '',
-          inline = this.isInline(),
-          stack;
-
-      // If we are currently inline then we want to merge the inline statement into the
-      // replacement statement via ','
-      if (inline) {
-        var top = this.popStack(true);
-
-        if (top instanceof Literal) {
-          // Literals do not need to be inlined
-          stack = top.value;
-        } else {
-          // Get or create the current stack name for use by the inline
-          var name = this.stackSlot ? this.topStackName() : this.incrStack();
+        var fn = options.fn, inverse = options.inverse;
+        var i = 0, ret = "", data;
 
-          prefix = '(' + this.push(name) + ' = ' + top + '),';
-          stack = this.topStack();
+        var contextPath;
+        if (options.data && options.ids) {
+          contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
         }
-      } else {
-        stack = this.topStack();
-      }
 
-      var item = callback.call(this, stack);
+        if (isFunction(context)) { context = context.call(this); }
 
-      if (inline) {
-        if (this.inlineStack.length || this.compileStack.length) {
-          this.popStack();
-        }
-        this.push('(' + prefix + item + ')');
-      } else {
-        // Prevent modification of the context depth variable. Through replaceStack
-        if (!/^stack/.test(stack)) {
-          stack = this.nextStack();
+        if (options.data) {
+          data = createFrame(options.data);
         }
 
-        this.pushSource(stack + " = (" + prefix + item + ");");
-      }
-      return stack;
-    },
-
-    nextStack: function() {
-      return this.pushStack();
-    },
-
-    incrStack: function() {
-      this.stackSlot++;
-      if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
-      return this.topStackName();
-    },
-    topStackName: function() {
-      return "stack" + this.stackSlot;
-    },
-    flushInline: function() {
-      var inlineStack = this.inlineStack;
-      if (inlineStack.length) {
-        this.inlineStack = [];
-        for (var i = 0, len = inlineStack.length; i < len; i++) {
-          var entry = inlineStack[i];
-          if (entry instanceof Literal) {
-            this.compileStack.push(entry);
+        if(context && typeof context === 'object') {
+          if (isArray(context)) {
+            for(var j = context.length; i<j; i++) {
+              if (data) {
+                data.index = i;
+                data.first = (i === 0);
+                data.last  = (i === (context.length-1));
+
+                if (contextPath) {
+                  data.contextPath = contextPath + i;
+                }
+              }
+              ret = ret + fn(context[i], { data: data });
+            }
           } else {
-            this.pushStack(entry);
+            for(var key in context) {
+              if(context.hasOwnProperty(key)) {
+                if(data) {
+                  data.key = key;
+                  data.index = i;
+                  data.first = (i === 0);
+
+                  if (contextPath) {
+                    data.contextPath = contextPath + key;
+                  }
+                }
+                ret = ret + fn(context[key], {data: data});
+                i++;
+              }
+            }
           }
         }
-      }
-    },
-    isInline: function() {
-      return this.inlineStack.length;
-    },
 
-    popStack: function(wrapped) {
-      var inline = this.isInline(),
-          item = (inline ? this.inlineStack : this.compileStack).pop();
-
-      if (!wrapped && (item instanceof Literal)) {
-        return item.value;
-      } else {
-        if (!inline) {
-          this.stackSlot--;
+        if(i === 0){
+          ret = inverse(this);
         }
-        return item;
-      }
-    },
-
-    topStack: function(wrapped) {
-      var stack = (this.isInline() ? this.inlineStack : this.compileStack),
-          item = stack[stack.length - 1];
-
-      if (!wrapped && (item instanceof Literal)) {
-        return item.value;
-      } else {
-        return item;
-      }
-    },
-
-    quotedString: function(str) {
-      return '"' + str
-        .replace(/\\/g, '\\\\')
-        .replace(/"/g, '\\"')
-        .replace(/\n/g, '\\n')
-        .replace(/\r/g, '\\r')
-        .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
-        .replace(/\u2029/g, '\\u2029') + '"';
-    },
-
-    setupHelper: function(paramSize, name, missingParams) {
-      var params = [];
-      this.setupParams(paramSize, params, missingParams);
-      var foundHelper = this.nameLookup('helpers', name, 'helper');
-
-      return {
-        params: params,
-        name: foundHelper,
-        callParams: ["depth0"].concat(params).join(", "),
-        helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
-      };
-    },
-
-    // the params and contexts arguments are passed in arrays
-    // to fill in
-    setupParams: function(paramSize, params, useRegister) {
-      var options = [], contexts = [], types = [], param, inverse, program;
-
-      options.push("hash:" + this.popStack());
 
-      inverse = this.popStack();
-      program = this.popStack();
-
-      // Avoid setting fn and inverse if neither are set. This allows
-      // helpers to do a check for `if (options.fn)`
-      if (program || inverse) {
-        if (!program) {
-          this.context.aliases.self = "this";
-          program = "self.noop";
-        }
-
-        if (!inverse) {
-         this.context.aliases.self = "this";
-          inverse = "self.noop";
-        }
-
-        options.push("inverse:" + inverse);
-        options.push("fn:" + program);
-      }
+        return ret;
+      });
 
-      for(var i=0; i<paramSize; i++) {
-        param = this.popStack();
-        params.push(param);
+      instance.registerHelper('if', function(conditional, options) {
+        if (isFunction(conditional)) { conditional = conditional.call(this); }
 
-        if(this.options.stringParams) {
-          types.push(this.popStack());
-          contexts.push(this.popStack());
+        // Default behavior is to render the positive path if the value is truthy and not empty.
+        // The `includeZero` option may be set to treat the condtional as purely not empty based on the
+        // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+        if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
+          return options.inverse(this);
+        } else {
+          return options.fn(this);
         }
-      }
-
-      if (this.options.stringParams) {
-        options.push("contexts:[" + contexts.join(",") + "]");
-        options.push("types:[" + types.join(",") + "]");
-        options.push("hashContexts:hashContexts");
-        options.push("hashTypes:hashTypes");
-      }
-
-      if(this.options.data) {
-        options.push("data:data");
-      }
-
-      options = "{" + options.join(",") + "}";
-      if (useRegister) {
-        this.register('options', options);
-        params.push('options');
-      } else {
-        params.push(options);
-      }
-      return params.join(", ");
-    }
-  };
-
-  var reservedWords = (
-    "break else new var" +
-    " case finally return void" +
-    " catch for switch while" +
-    " continue function this with" +
-    " default if throw" +
-    " delete in try" +
-    " do instanceof typeof" +
-    " abstract enum int short" +
-    " boolean export interface static" +
-    " byte extends long super" +
-    " char final native synchronized" +
-    " class float package throws" +
-    " const goto private transient" +
-    " debugger implements protected volatile" +
-    " double import public let yield"
-  ).split(" ");
-
-  var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
-
-  for(var i=0, l=reservedWords.length; i<l; i++) {
-    compilerWords[reservedWords[i]] = true;
-  }
-
-  JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-    if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
-      return true;
-    }
-    return false;
-  };
-
-  __exports__ = JavaScriptCompiler;
-  return __exports__;
-})(__module2__);
-
-// handlebars/compiler/compiler.js
-var __module10__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
-  "use strict";
-  var __exports__ = {};
-  var Exception = __dependency1__;
-  var parse = __dependency2__.parse;
-  var JavaScriptCompiler = __dependency3__;
-  var AST = __dependency4__;
-
-  function Compiler() {}
+      });
 
-  __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a
-  // function in a context. This is necessary for mustache compatibility, which
-  // requires that context functions in blocks are evaluated by blockHelperMissing,
-  // and then proceed as if the resulting value was provided to blockHelperMissing.
+      instance.registerHelper('unless', function(conditional, options) {
+        return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+      });
 
-  Compiler.prototype = {
-    compiler: Compiler,
+      instance.registerHelper('with', function(context, options) {
+        if (isFunction(context)) { context = context.call(this); }
 
-    disassemble: function() {
-      var opcodes = this.opcodes, opcode, out = [], params, param;
+        var fn = options.fn;
 
-      for (var i=0, l=opcodes.length; i<l; i++) {
-        opcode = opcodes[i];
+        if (!Utils.isEmpty(context)) {
+          if (options.data && options.ids) {
+            var data = createFrame(options.data);
+            data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
+            options = {data:data};
+          }
 
-        if (opcode.opcode === 'DECLARE') {
-          out.push("DECLARE " + opcode.name + "=" + opcode.value);
+          return fn(context, options);
         } else {
-          params = [];
-          for (var j=0; j<opcode.args.length; j++) {
-            param = opcode.args[j];
-            if (typeof param === "string") {
-              param = "\"" + param.replace("\n", "\\n") + "\"";
-            }
-            params.push(param);
-          }
-          out.push(opcode.opcode + " " + params.join(" "));
+          return options.inverse(this);
         }
-      }
+      });
 
-      return out.join("\n");
-    },
+      instance.registerHelper('log', function(message, options) {
+        var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
+        instance.log(level, message);
+      });
 
-    equals: function(other) {
-      var len = this.opcodes.length;
-      if (other.opcodes.length !== len) {
-        return false;
-      }
+      instance.registerHelper('lookup', function(obj, field) {
+        return obj && obj[field];
+      });
+    }
 
-      for (var i = 0; i < len; i++) {
-        var opcode = this.opcodes[i],
-            otherOpcode = other.opcodes[i];
-        if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
-          return false;
-        }
-        for (var j = 0; j < opcode.args.length; j++) {
-          if (opcode.args[j] !== otherOpcode.args[j]) {
-            return false;
+    var logger = {
+      methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
+
+      // State enum
+      DEBUG: 0,
+      INFO: 1,
+      WARN: 2,
+      ERROR: 3,
+      level: 3,
+
+      // can be overridden in the host environment
+      log: function(level, message) {
+        if (logger.level <= level) {
+          var method = logger.methodMap[level];
+          if (typeof console !== 'undefined' && console[method]) {
+            console[method].call(console, message);
           }
         }
       }
+    };
+    __exports__.logger = logger;
+    var log = logger.log;
+    __exports__.log = log;
+    var createFrame = function(object) {
+      var frame = Utils.extend({}, object);
+      frame._parent = object;
+      return frame;
+    };
+    __exports__.createFrame = createFrame;
+    return __exports__;
+  })(__module2__, __module4__);
 
-      len = this.children.length;
-      if (other.children.length !== len) {
-        return false;
-      }
-      for (i = 0; i < len; i++) {
-        if (!this.children[i].equals(other.children[i])) {
-          return false;
-        }
-      }
-
-      return true;
-    },
-
-    guid: 0,
-
-    compile: function(program, options) {
-      this.opcodes = [];
-      this.children = [];
-      this.depths = {list: []};
-      this.options = options;
-
-      // These changes will propagate to the other compiler components
-      var knownHelpers = this.options.knownHelpers;
-      this.options.knownHelpers = {
-        'helperMissing': true,
-        'blockHelperMissing': true,
-        'each': true,
-        'if': true,
-        'unless': true,
-        'with': true,
-        'log': true
-      };
-      if (knownHelpers) {
-        for (var name in knownHelpers) {
-          this.options.knownHelpers[name] = knownHelpers[name];
+// handlebars/runtime.js
+  var __module5__ = (function(__dependency1__, __dependency2__, __dependency3__) {
+    "use strict";
+    var __exports__ = {};
+    var Utils = __dependency1__;
+    var Exception = __dependency2__;
+    var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
+    var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
+    var createFrame = __dependency3__.createFrame;
+
+    function checkRevision(compilerInfo) {
+      var compilerRevision = compilerInfo && compilerInfo[0] || 1,
+          currentRevision = COMPILER_REVISION;
+
+      if (compilerRevision !== currentRevision) {
+        if (compilerRevision < currentRevision) {
+          var runtimeVersions = REVISION_CHANGES[currentRevision],
+              compilerVersions = REVISION_CHANGES[compilerRevision];
+          throw new Exception("Template was precompiled with an older version of Handlebars than the current runtime. "+
+          "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
+        } else {
+          // Use the embedded version info since the runtime doesn't know about this revision yet
+          throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
+          "Please update your runtime to a newer version ("+compilerInfo[1]+").");
         }
       }
+    }
 
-      return this.accept(program);
-    },
-
-    accept: function(node) {
-      var strip = node.strip || {},
-          ret;
-      if (strip.left) {
-        this.opcode('strip');
-      }
-
-      ret = this[node.type](node);
-
-      if (strip.right) {
-        this.opcode('strip');
-      }
-
-      return ret;
-    },
-
-    program: function(program) {
-      var statements = program.statements;
-
-      for(var i=0, l=statements.length; i<l; i++) {
-        this.accept(statements[i]);
-      }
-      this.isSimple = l === 1;
-
-      this.depths.list = this.depths.list.sort(function(a, b) {
-        return a - b;
-      });
-
-      return this;
-    },
-
-    compileProgram: function(program) {
-      var result = new this.compiler().compile(program, this.options);
-      var guid = this.guid++, depth;
-
-      this.usePartial = this.usePartial || result.usePartial;
-
-      this.children[guid] = result;
-
-      for(var i=0, l=result.depths.list.length; i<l; i++) {
-        depth = result.depths.list[i];
-
-        if(depth < 2) { continue; }
-        else { this.addDepth(depth - 1); }
-      }
-
-      return guid;
-    },
-
-    block: function(block) {
-      var mustache = block.mustache,
-          program = block.program,
-          inverse = block.inverse;
-
-      if (program) {
-        program = this.compileProgram(program);
-      }
+    __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
 
-      if (inverse) {
-        inverse = this.compileProgram(inverse);
+    function template(templateSpec, env) {
+      /* istanbul ignore next */
+      if (!env) {
+        throw new Exception("No environment passed to template");
       }
-
-      var type = this.classifyMustache(mustache);
-
-      if (type === "helper") {
-        this.helperMustache(mustache, program, inverse);
-      } else if (type === "simple") {
-        this.simpleMustache(mustache);
-
-        // now that the simple mustache is resolved, we need to
-        // evaluate it by executing `blockHelperMissing`
-        this.opcode('pushProgram', program);
-        this.opcode('pushProgram', inverse);
-        this.opcode('emptyHash');
-        this.opcode('blockValue');
-      } else {
-        this.ambiguousMustache(mustache, program, inverse);
-
-        // now that the simple mustache is resolved, we need to
-        // evaluate it by executing `blockHelperMissing`
-        this.opcode('pushProgram', program);
-        this.opcode('pushProgram', inverse);
-        this.opcode('emptyHash');
-        this.opcode('ambiguousBlockValue');
+      if (!templateSpec || !templateSpec.main) {
+        throw new Exception('Unknown template object: ' + typeof templateSpec);
       }
 
-      this.opcode('append');
-    },
+      // Note: Using env.VM references rather than local var references throughout this section to allow
+      // for external users to override these as psuedo-supported APIs.
+      env.VM.checkRevision(templateSpec.compiler);
 
-    hash: function(hash) {
-      var pairs = hash.pairs, pair, val;
+      var invokePartialWrapper = function(partial, indent, name, context, hash, helpers, partials, data, depths) {
+        if (hash) {
+          context = Utils.extend({}, context, hash);
+        }
 
-      this.opcode('pushHash');
+        var result = env.VM.invokePartial.call(this, partial, name, context, helpers, partials, data, depths);
 
-      for(var i=0, l=pairs.length; i<l; i++) {
-        pair = pairs[i];
-        val  = pair[1];
+        if (result == null && env.compile) {
+          var options = { helpers: helpers, partials: partials, data: data, depths: depths };
+          partials[name] = env.compile(partial, { data: data !== undefined, compat: templateSpec.compat }, env);
+          result = partials[name](context, options);
+        }
+        if (result != null) {
+          if (indent) {
+            var lines = result.split('\n');
+            for (var i = 0, l = lines.length; i < l; i++) {
+              if (!lines[i] && i + 1 === l) {
+                break;
+              }
 
-        if (this.options.stringParams) {
-          if(val.depth) {
-            this.addDepth(val.depth);
+              lines[i] = indent + lines[i];
+            }
+            result = lines.join('\n');
           }
-          this.opcode('getContext', val.depth || 0);
-          this.opcode('pushStringParam', val.stringModeValue, val.type);
+          return result;
         } else {
-          this.accept(val);
+          throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
         }
+      };
 
-        this.opcode('assignToHash', pair[0]);
-      }
-      this.opcode('popHash');
-    },
-
-    partial: function(partial) {
-      var partialName = partial.partialName;
-      this.usePartial = true;
-
-      if(partial.context) {
-        this.ID(partial.context);
-      } else {
-        this.opcode('push', 'depth0');
-      }
-
-      this.opcode('invokePartial', partialName.name);
-      this.opcode('append');
-    },
-
-    content: function(content) {
-      this.opcode('appendContent', content.string);
-    },
-
-    mustache: function(mustache) {
-      var options = this.options;
-      var type = this.classifyMustache(mustache);
-
-      if (type === "simple") {
-        this.simpleMustache(mustache);
-      } else if (type === "helper") {
-        this.helperMustache(mustache);
-      } else {
-        this.ambiguousMustache(mustache);
-      }
-
-      if(mustache.escaped && !options.noEscape) {
-        this.opcode('appendEscaped');
-      } else {
-        this.opcode('append');
-      }
-    },
-
-    ambiguousMustache: function(mustache, program, inverse) {
-      var id = mustache.id,
-          name = id.parts[0],
-          isBlock = program != null || inverse != null;
-
-      this.opcode('getContext', id.depth);
-
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-
-      this.opcode('invokeAmbiguous', name, isBlock);
-    },
-
-    simpleMustache: function(mustache) {
-      var id = mustache.id;
-
-      if (id.type === 'DATA') {
-        this.DATA(id);
-      } else if (id.parts.length) {
-        this.ID(id);
-      } else {
-        // Simplified ID for `this`
-        this.addDepth(id.depth);
-        this.opcode('getContext', id.depth);
-        this.opcode('pushContext');
-      }
-
-      this.opcode('resolvePossibleLambda');
-    },
-
-    helperMustache: function(mustache, program, inverse) {
-      var params = this.setupFullMustacheParams(mustache, program, inverse),
-          name = mustache.id.parts[0];
-
-      if (this.options.knownHelpers[name]) {
-        this.opcode('invokeKnownHelper', params.length, name);
-      } else if (this.options.knownHelpersOnly) {
-        throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
-      } else {
-        this.opcode('invokeHelper', params.length, name);
-      }
-    },
-
-    ID: function(id) {
-      this.addDepth(id.depth);
-      this.opcode('getContext', id.depth);
-
-      var name = id.parts[0];
-      if (!name) {
-        this.opcode('pushContext');
-      } else {
-        this.opcode('lookupOnContext', id.parts[0]);
-      }
-
-      for(var i=1, l=id.parts.length; i<l; i++) {
-        this.opcode('lookup', id.parts[i]);
-      }
-    },
-
-    DATA: function(data) {
-      this.options.data = true;
-      if (data.id.isScoped || data.id.depth) {
-        throw new Exception('Scoped data references are not supported: ' + data.original);
-      }
-
-      this.opcode('lookupData');
-      var parts = data.id.parts;
-      for(var i=0, l=parts.length; i<l; i++) {
-        this.opcode('lookup', parts[i]);
-      }
-    },
-
-    STRING: function(string) {
-      this.opcode('pushString', string.string);
-    },
-
-    INTEGER: function(integer) {
-      this.opcode('pushLiteral', integer.integer);
-    },
+      // Just add water
+      var container = {
+        lookup: function(depths, name) {
+          var len = depths.length;
+          for (var i = 0; i < len; i++) {
+            if (depths[i] && depths[i][name] != null) {
+              return depths[i][name];
+            }
+          }
+        },
+        lambda: function(current, context) {
+          return typeof current === 'function' ? current.call(context) : current;
+        },
 
-    BOOLEAN: function(bool) {
-      this.opcode('pushLiteral', bool.bool);
-    },
+        escapeExpression: Utils.escapeExpression,
+        invokePartial: invokePartialWrapper,
 
-    comment: function() {},
+        fn: function(i) {
+          return templateSpec[i];
+        },
 
-    // HELPERS
-    opcode: function(name) {
-      this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
-    },
+        programs: [],
+        program: function(i, data, depths) {
+          var programWrapper = this.programs[i],
+              fn = this.fn(i);
+          if (data || depths) {
+            programWrapper = program(this, i, fn, data, depths);
+          } else if (!programWrapper) {
+            programWrapper = this.programs[i] = program(this, i, fn);
+          }
+          return programWrapper;
+        },
 
-    declare: function(name, value) {
-      this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
-    },
+        data: function(data, depth) {
+          while (data && depth--) {
+            data = data._parent;
+          }
+          return data;
+        },
+        merge: function(param, common) {
+          var ret = param || common;
 
-    addDepth: function(depth) {
-      if(isNaN(depth)) { throw new Error("EWOT"); }
-      if(depth === 0) { return; }
+          if (param && common && (param !== common)) {
+            ret = Utils.extend({}, common, param);
+          }
 
-      if(!this.depths[depth]) {
-        this.depths[depth] = true;
-        this.depths.list.push(depth);
-      }
-    },
+          return ret;
+        },
 
-    classifyMustache: function(mustache) {
-      var isHelper   = mustache.isHelper;
-      var isEligible = mustache.eligibleHelper;
-      var options    = this.options;
+        noop: env.VM.noop,
+        compilerInfo: templateSpec.compiler
+      };
 
-      // if ambiguous, we can possibly resolve the ambiguity now
-      if (isEligible && !isHelper) {
-        var name = mustache.id.parts[0];
+      var ret = function(context, options) {
+        options = options || {};
+        var data = options.data;
 
-        if (options.knownHelpers[name]) {
-          isHelper = true;
-        } else if (options.knownHelpersOnly) {
-          isEligible = false;
+        ret._setup(options);
+        if (!options.partial && templateSpec.useData) {
+          data = initData(context, data);
+        }
+        var depths;
+        if (templateSpec.useDepths) {
+          depths = options.depths ? [context].concat(options.depths) : [context];
         }
-      }
-
-      if (isHelper) { return "helper"; }
-      else if (isEligible) { return "ambiguous"; }
-      else { return "simple"; }
-    },
 
-    pushParams: function(params) {
-      var i = params.length, param;
+        return templateSpec.main.call(container, context, container.helpers, container.partials, data, depths);
+      };
+      ret.isTop = true;
 
-      while(i--) {
-        param = params[i];
+      ret._setup = function(options) {
+        if (!options.partial) {
+          container.helpers = container.merge(options.helpers, env.helpers);
 
-        if(this.options.stringParams) {
-          if(param.depth) {
-            this.addDepth(param.depth);
+          if (templateSpec.usePartial) {
+            container.partials = container.merge(options.partials, env.partials);
           }
-
-          this.opcode('getContext', param.depth || 0);
-          this.opcode('pushStringParam', param.stringModeValue, param.type);
         } else {
-          this[param.type](param);
+          container.helpers = options.helpers;
+          container.partials = options.partials;
         }
-      }
-    },
-
-    setupMustacheParams: function(mustache) {
-      var params = mustache.params;
-      this.pushParams(params);
-
-      if(mustache.hash) {
-        this.hash(mustache.hash);
-      } else {
-        this.opcode('emptyHash');
-      }
-
-      return params;
-    },
-
-    // this will replace setupMustacheParams when we're done
-    setupFullMustacheParams: function(mustache, program, inverse) {
-      var params = mustache.params;
-      this.pushParams(params);
-
-      this.opcode('pushProgram', program);
-      this.opcode('pushProgram', inverse);
-
-      if(mustache.hash) {
-        this.hash(mustache.hash);
-      } else {
-        this.opcode('emptyHash');
-      }
-
-      return params;
-    }
-  };
+      };
 
-  function precompile(input, options) {
-    if (input == null || (typeof input !== 'string' && input.constructor !== AST.ProgramNode)) {
-      throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
-    }
+      ret._child = function(i, data, depths) {
+        if (templateSpec.useDepths && !depths) {
+          throw new Exception('must pass parent depths');
+        }
 
-    options = options || {};
-    if (!('data' in options)) {
-      options.data = true;
+        return program(container, i, templateSpec[i], data, depths);
+      };
+      return ret;
     }
 
-    var ast = parse(input);
-    var environment = new Compiler().compile(ast, options);
-    return new JavaScriptCompiler().compile(environment, options);
-  }
+    __exports__.template = template;function program(container, i, fn, data, depths) {
+      var prog = function(context, options) {
+        options = options || {};
 
-  __exports__.precompile = precompile;function compile(input, options, env) {
-    if (input == null || (typeof input !== 'string' && input.constructor !== AST.ProgramNode)) {
-      throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
+        return fn.call(container, context, container.helpers, container.partials, options.data || data, depths && [context].concat(depths));
+      };
+      prog.program = i;
+      prog.depth = depths ? depths.length : 0;
+      return prog;
     }
 
-    options = options || {};
+    __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data, depths) {
+      var options = { partial: true, helpers: helpers, partials: partials, data: data, depths: depths };
 
-    if (!('data' in options)) {
-      options.data = true;
+      if(partial === undefined) {
+        throw new Exception("The partial " + name + " could not be found");
+      } else if(partial instanceof Function) {
+        return partial(context, options);
+      }
     }
 
-    var compiled;
+    __exports__.invokePartial = invokePartial;function noop() { return ""; }
 
-    function compileInput() {
-      var ast = parse(input);
-      var environment = new Compiler().compile(ast, options);
-      var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
-      return env.template(templateSpec);
+    __exports__.noop = noop;function initData(context, data) {
+      if (!data || !('root' in data)) {
+        data = data ? createFrame(data) : {};
+        data.root = context;
+      }
+      return data;
     }
+    return __exports__;
+  })(__module2__, __module4__, __module1__);
 
-    // Template is only compiled on first use and cached after that point.
-    return function(context, options) {
-      if (!compiled) {
-        compiled = compileInput();
-      }
-      return compiled.call(this, context, options);
-    };
-  }
+// handlebars.runtime.js
+  var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+    "use strict";
+    var __exports__;
+    /*globals Handlebars: true */
+    var base = __dependency1__;
+
+    // Each of these augment the Handlebars object. No need to setup here.
+    // (This is done to easily share code between commonjs and browse envs)
+    var SafeString = __dependency2__;
+    var Exception = __dependency3__;
+    var Utils = __dependency4__;
+    var runtime = __dependency5__;
+
+    // For compatibility and usage outside of module systems, make the Handlebars object a namespace
+    var create = function() {
+      var hb = new base.HandlebarsEnvironment();
+
+      Utils.extend(hb, base);
+      hb.SafeString = SafeString;
+      hb.Exception = Exception;
+      hb.Utils = Utils;
+      hb.escapeExpression = Utils.escapeExpression;
+
+      hb.VM = runtime;
+      hb.template = function(spec) {
+        return runtime.template(spec, hb);
+      };
 
-  __exports__.compile = compile;
-  return __exports__;
-})(__module5__, __module8__, __module11__, __module7__);
-
-// handlebars.js
-var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
-  "use strict";
-  var __exports__;
-  /*globals Handlebars: true */
-  var Handlebars = __dependency1__;
-
-  // Compiler imports
-  var AST = __dependency2__;
-  var Parser = __dependency3__.parser;
-  var parse = __dependency3__.parse;
-  var Compiler = __dependency4__.Compiler;
-  var compile = __dependency4__.compile;
-  var precompile = __dependency4__.precompile;
-  var JavaScriptCompiler = __dependency5__;
-
-  var _create = Handlebars.create;
-  var create = function() {
-    var hb = _create();
-
-    hb.compile = function(input, options) {
-      return compile(input, options, hb);
+      return hb;
     };
-    hb.precompile = precompile;
-
-    hb.AST = AST;
-    hb.Compiler = Compiler;
-    hb.JavaScriptCompiler = JavaScriptCompiler;
-    hb.Parser = Parser;
-    hb.parse = parse;
 
-    return hb;
-  };
+    var Handlebars = create();
+    Handlebars.create = create;
 
-  Handlebars = create();
-  Handlebars.create = create;
+    Handlebars['default'] = Handlebars;
 
-  __exports__ = Handlebars;
-  return __exports__;
-})(__module1__, __module7__, __module8__, __module10__, __module11__);
+    __exports__ = Handlebars;
+    return __exports__;
+  })(__module1__, __module3__, __module4__, __module2__, __module5__);
 
   return __module0__;
-})();
+}));
-- 
2.39.5