From 5ca25b924efdb77da2c04d306effc3bb5a8d97c5 Mon Sep 17 00:00:00 2001 From: Aaron Tan Date: Mon, 24 Oct 2016 11:06:25 -0400 Subject: [PATCH 01/21] Add missing always_node check in bfs --- awx/main/scheduler/dag_workflow.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/awx/main/scheduler/dag_workflow.py b/awx/main/scheduler/dag_workflow.py index c891b2ec32..6d2b349365 100644 --- a/awx/main/scheduler/dag_workflow.py +++ b/awx/main/scheduler/dag_workflow.py @@ -42,7 +42,9 @@ class WorkflowDAG(SimpleDAG): nodes.extend(children_all) elif job.status in ['successful']: children_success = self.get_dependencies(obj, 'success_nodes') - nodes.extend(children_success) + children_always = self.get_dependencies(obj, 'always_nodes') + children_all = children_success + children_always + nodes.extend(children_all) return [n['node_object'] for n in nodes_found] def is_workflow_done(self): @@ -67,6 +69,8 @@ class WorkflowDAG(SimpleDAG): nodes.extend(children_all) elif job.status in ['successful']: children_success = self.get_dependencies(obj, 'success_nodes') - nodes.extend(children_success) + children_always = self.get_dependencies(obj, 'always_nodes') + children_all = children_success + children_always + nodes.extend(children_all) return True From bb34ca662f402b1cbbd91577437bbceea3c34eb2 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 24 Oct 2016 16:45:37 -0400 Subject: [PATCH 02/21] update job unit tests to HA project update changes --- awx/main/tests/unit/models/test_job_unit.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awx/main/tests/unit/models/test_job_unit.py b/awx/main/tests/unit/models/test_job_unit.py index 9de1f77ee6..ff55d7103b 100644 --- a/awx/main/tests/unit/models/test_job_unit.py +++ b/awx/main/tests/unit/models/test_job_unit.py @@ -7,12 +7,14 @@ from awx.main.models import Job @pytest.fixture def job(mocker): - return mocker.MagicMock(**{ + ret = mocker.MagicMock(**{ 'display_extra_vars.return_value': '{\"secret_key\": \"$encrypted$\"}', 'extra_vars_dict': {"secret_key": "my_password"}, 'pk': 1, 'job_template.pk': 1, 'job_template.name': '', 'created_by.pk': 1, 'created_by.username': 'admin', 'launch_type': 'manual'}) + ret.project = mocker.MagicMock(scm_revision='asdf1234') + return ret @pytest.mark.survey def test_job_survey_password_redaction(): From 56a9978d560ca96c428429de6f153104adc05f6f Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 13 Oct 2016 12:44:13 -0400 Subject: [PATCH 03/21] Introduce workflow failure condition --- awx/api/serializers.py | 6 ++- .../0041_v310_workflow_failure_condition.py | 24 ++++++++++++ awx/main/models/workflow.py | 9 ++++- awx/main/scheduler/__init__.py | 8 ++-- .../tests/functional/models/test_workflow.py | 39 +++++++++++++++++++ 5 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 awx/main/migrations/0041_v310_workflow_failure_condition.py diff --git a/awx/api/serializers.py b/awx/api/serializers.py index d6aa39f706..4b5b411a08 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2249,11 +2249,15 @@ class WorkflowNodeBaseSerializer(BaseSerializer): success_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) failure_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) always_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) + fail_on_job_failure = serializers.BooleanField( + help_text=('If set to true, and if the job runs and fails, ' + 'the workflow will also be marked as failed.'), + default=True) class Meta: fields = ('*', '-name', '-description', 'id', 'url', 'related', 'unified_job_template', 'success_nodes', 'failure_nodes', 'always_nodes', - 'inventory', 'credential', 'job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags') + 'inventory', 'credential', 'job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags', 'fail_on_job_failure') def get_related(self, obj): res = super(WorkflowNodeBaseSerializer, self).get_related(obj) diff --git a/awx/main/migrations/0041_v310_workflow_failure_condition.py b/awx/main/migrations/0041_v310_workflow_failure_condition.py new file mode 100644 index 0000000000..8544f9884a --- /dev/null +++ b/awx/main/migrations/0041_v310_workflow_failure_condition.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0040_v310_artifacts'), + ] + + operations = [ + migrations.AddField( + model_name='workflowjobnode', + name='fail_on_job_failure', + field=models.BooleanField(default=True), + ), + migrations.AddField( + model_name='workflowjobtemplatenode', + name='fail_on_job_failure', + field=models.BooleanField(default=True), + ), + ] diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 2848b38a4a..6ef5e88956 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -60,6 +60,10 @@ class WorkflowNodeBase(CreatedModifiedModel): default=None, on_delete=models.SET_NULL, ) + fail_on_job_failure = models.BooleanField( + blank=True, + default=True, + ) # Prompting-related fields inventory = models.ForeignKey( 'Inventory', @@ -137,7 +141,7 @@ class WorkflowNodeBase(CreatedModifiedModel): Return field names that should be copied from template node to job node. ''' return ['workflow_job', 'unified_job_template', - 'inventory', 'credential', 'char_prompts'] + 'inventory', 'credential', 'char_prompts', 'fail_on_job_failure'] class WorkflowJobTemplateNode(WorkflowNodeBase): # TODO: Ensure the API forces workflow_job_template being set @@ -383,6 +387,9 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, JobNotificationMixin, Workflow from awx.main.tasks import RunWorkflowJob return RunWorkflowJob + def _has_failed(self): + return self.workflow_job_nodes.filter(job__status='failed', fail_on_job_failure=True).exists() + def socketio_emit_data(self): return {} diff --git a/awx/main/scheduler/__init__.py b/awx/main/scheduler/__init__.py index b93ce6956e..6ecdc09b37 100644 --- a/awx/main/scheduler/__init__.py +++ b/awx/main/scheduler/__init__.py @@ -73,10 +73,12 @@ def process_finished_workflow_jobs(workflow_jobs): dag = WorkflowDAG(workflow_job) if dag.is_workflow_done(): with transaction.atomic(): - # TODO: detect if wfj failed - workflow_job.status = 'completed' + if workflow_job._has_failed(): + workflow_job.status = 'failed' + else: + workflow_job.status = 'successful' workflow_job.save() - workflow_job.websocket_emit_status('completed') + workflow_job.websocket_emit_status(workflow_job.status) def rebuild_graph(): """Regenerate the task graph by refreshing known tasks from Tower, purging diff --git a/awx/main/tests/functional/models/test_workflow.py b/awx/main/tests/functional/models/test_workflow.py index cc61c34ed9..aa622d996a 100644 --- a/awx/main/tests/functional/models/test_workflow.py +++ b/awx/main/tests/functional/models/test_workflow.py @@ -90,3 +90,42 @@ class TestWorkflowJobTemplate: assert len(parent_qs) == 1 assert parent_qs[0] == wfjt.workflow_job_template_nodes.all()[1] +@pytest.mark.django_db +class TestWorkflowJobFailure: + @pytest.fixture + def wfj(self): + return WorkflowJob.objects.create(name='test-wf-job') + + def test_workflow_has_failed(self, wfj): + """ + Test that a single failed node with fail_on_job_failure = true + leads to the entire WF being marked as failed + """ + job = Job.objects.create(name='test-job', status='failed') + # Node has a failed job connected + WorkflowJobNode.objects.create(workflow_job=wfj, job=job) + assert wfj._has_failed() + + def test_workflow_not_failed_unran_job(self, wfj): + """ + Test that an un-ran node will not mark workflow job as failed + """ + WorkflowJobNode.objects.create(workflow_job=wfj) + assert not wfj._has_failed() + + def test_workflow_not_failed_successful_job(self, wfj): + """ + Test that a sucessful node will not mark workflow job as failed + """ + job = Job.objects.create(name='test-job', status='successful') + WorkflowJobNode.objects.create(workflow_job=wfj, job=job) + assert not wfj._has_failed() + + def test_workflow_not_failed_failed_job_but_okay(self, wfj): + """ + Test that a failed node will not mark workflow job as failed + if the fail_on_job_failure is set to false + """ + job = Job.objects.create(name='test-job', status='failed') + WorkflowJobNode.objects.create(workflow_job=wfj, job=job, fail_on_job_failure=False) + assert not wfj._has_failed() From 48fc9eb773663cbc9db445948fdc2cfd0d85bae4 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 14 Oct 2016 16:30:58 -0400 Subject: [PATCH 04/21] update workflow model unit tests --- awx/main/tests/unit/models/test_workflow_unit.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/awx/main/tests/unit/models/test_workflow_unit.py b/awx/main/tests/unit/models/test_workflow_unit.py index 9df61ffe97..bcbec85c81 100644 --- a/awx/main/tests/unit/models/test_workflow_unit.py +++ b/awx/main/tests/unit/models/test_workflow_unit.py @@ -139,6 +139,7 @@ class TestWorkflowJobCreate: char_prompts=wfjt_node_no_prompts.char_prompts, inventory=None, credential=None, unified_job_template=wfjt_node_no_prompts.unified_job_template, + fail_on_job_failure=True, workflow_job=workflow_job_unit) def test_create_with_prompts(self, wfjt_node_with_prompts, workflow_job_unit, mocker): @@ -150,6 +151,7 @@ class TestWorkflowJobCreate: inventory=wfjt_node_with_prompts.inventory, credential=wfjt_node_with_prompts.credential, unified_job_template=wfjt_node_with_prompts.unified_job_template, + fail_on_job_failure=True, workflow_job=workflow_job_unit) @mock.patch('awx.main.models.workflow.WorkflowNodeBase.get_parent_nodes', lambda self: []) From 10c847e8048055e37be2517a11425ea3425b02eb Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 17 Oct 2016 08:35:26 -0400 Subject: [PATCH 05/21] docs feedback for fojf incorporated --- awx/api/serializers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 4b5b411a08..a463a06064 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2251,7 +2251,7 @@ class WorkflowNodeBaseSerializer(BaseSerializer): always_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) fail_on_job_failure = serializers.BooleanField( help_text=('If set to true, and if the job runs and fails, ' - 'the workflow will also be marked as failed.'), + 'the workflow is marked as failed.'), default=True) class Meta: From e0173a5ca2174fc07bb07ba367b16e597da27048 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 25 Oct 2016 09:16:09 -0400 Subject: [PATCH 06/21] bump migration file number --- ...ilure_condition.py => 0045_v310_workflow_failure_condition.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename awx/main/migrations/{0041_v310_workflow_failure_condition.py => 0045_v310_workflow_failure_condition.py} (100%) diff --git a/awx/main/migrations/0041_v310_workflow_failure_condition.py b/awx/main/migrations/0045_v310_workflow_failure_condition.py similarity index 100% rename from awx/main/migrations/0041_v310_workflow_failure_condition.py rename to awx/main/migrations/0045_v310_workflow_failure_condition.py From 836c13f8571a3be69cfcc7b597eff31fb39097d9 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 25 Oct 2016 09:18:14 -0400 Subject: [PATCH 07/21] bump migration dependency --- awx/main/migrations/0045_v310_workflow_failure_condition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/migrations/0045_v310_workflow_failure_condition.py b/awx/main/migrations/0045_v310_workflow_failure_condition.py index 8544f9884a..9bafa0feb6 100644 --- a/awx/main/migrations/0045_v310_workflow_failure_condition.py +++ b/awx/main/migrations/0045_v310_workflow_failure_condition.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0040_v310_artifacts'), + ('main', '0044_v310_project_playbook_files'), ] operations = [ From 04013e4d9f9daef86e0d82c33fdfae8f250d0a8c Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Tue, 25 Oct 2016 16:34:36 -0400 Subject: [PATCH 08/21] fix problems with OPTIONS for char_prompts --- awx/api/serializers.py | 26 +++++++++++--------------- awx/api/views.py | 5 +++++ awx/main/models/workflow.py | 16 ++++++++++++++++ 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index a463a06064..70e37b8220 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -2242,10 +2242,10 @@ class WorkflowJobListSerializer(WorkflowJobSerializer, UnifiedJobListSerializer) pass class WorkflowNodeBaseSerializer(BaseSerializer): - job_type = serializers.SerializerMethodField() - job_tags = serializers.SerializerMethodField() - limit = serializers.SerializerMethodField() - skip_tags = serializers.SerializerMethodField() + job_type = serializers.CharField(allow_blank=True, required=False, default=None) + job_tags = serializers.CharField(allow_blank=True, required=False, default=None) + limit = serializers.CharField(allow_blank=True, required=False, default=None) + skip_tags = serializers.CharField(allow_blank=True, required=False, default=None) success_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) failure_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) always_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) @@ -2265,17 +2265,13 @@ class WorkflowNodeBaseSerializer(BaseSerializer): res['unified_job_template'] = obj.unified_job_template.get_absolute_url() return res - def get_job_type(self, obj): - return obj.char_prompts.get('job_type', None) - - def get_job_tags(self, obj): - return obj.char_prompts.get('job_tags', None) - - def get_skip_tags(self, obj): - return obj.char_prompts.get('skip_tags', None) - - def get_limit(self, obj): - return obj.char_prompts.get('limit', None) + def validate(self, attrs): + # char_prompts go through different validation, so remove them here + print ' attrs: ' + str(attrs) + for fd in ['job_type', 'job_tags', 'skip_tags', 'limit']: + if fd in attrs: + attrs.pop(fd) + return super(WorkflowNodeBaseSerializer, self).validate(attrs) class WorkflowJobTemplateNodeSerializer(WorkflowNodeBaseSerializer): diff --git a/awx/api/views.py b/awx/api/views.py index 66980e141d..2327f11b6a 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2751,6 +2751,11 @@ class WorkflowJobTemplateWorkflowNodesList(SubListCreateAPIView): relationship = 'workflow_job_template_nodes' parent_key = 'workflow_job_template' + def update_raw_data(self, data): + for fd in ['job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags']: + data[fd] = None + return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data) + # TODO: class WorkflowJobTemplateJobsList(SubListAPIView): diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 6ef5e88956..3bc0608cfc 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -97,6 +97,22 @@ class WorkflowNodeBase(CreatedModifiedModel): data[fd] = self.char_prompts[fd] return data + @property + def job_type(self): + return self.char_prompts.get('job_type', None) + + @property + def job_tags(self): + return self.char_prompts.get('job_tags', None) + + @property + def skip_tags(self): + return self.char_prompts.get('skip_tags', None) + + @property + def limit(self): + return self.char_prompts.get('limit', None) + def get_prompts_warnings(self): ujt_obj = self.unified_job_template if ujt_obj is None: From 40b94a38a86aa0d2a4cc38861c3d1bd64e3feb3e Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 7 Oct 2016 18:43:33 +0900 Subject: [PATCH 09/21] Enable message i18n with angular-gettext Signed-off-by: Takao Fujiwara --- Makefile | 41 +- awx/ui/Gruntfile.js | 1 + awx/ui/client/src/about/about.controller.js | 4 +- awx/ui/client/src/about/about.partial.html | 2 +- awx/ui/client/src/app.js | 36 +- .../src/bread-crumb/bread-crumb.partial.html | 2 +- awx/ui/client/src/controllers/Projects.js | 112 +- awx/ui/client/src/controllers/Users.js | 34 +- .../counts/dashboard-counts.directive.js | 15 +- .../graphs/dashboard-graphs.partial.html | 34 +- .../job-status/job-status-graph.directive.js | 11 +- .../dashboard/hosts/dashboard-hosts.list.js | 8 +- .../job-templates-list.partial.html | 14 +- .../lists/jobs/jobs-list.partial.html | 12 +- awx/ui/client/src/forms/Credentials.js | 111 +- awx/ui/client/src/forms/Inventories.js | 35 +- awx/ui/client/src/forms/JobTemplates.js | 154 +- awx/ui/client/src/forms/Organizations.js | 25 +- awx/ui/client/src/forms/Projects.js | 78 +- awx/ui/client/src/forms/Teams.js | 41 +- awx/ui/client/src/forms/Users.js | 47 +- awx/ui/client/src/helpers/Credentials.js | 92 +- awx/ui/client/src/i18n.js | 97 + .../inventory-scripts.form.js | 20 +- .../inventory-scripts.list.js | 28 +- .../add/job-templates-add.route.js | 3 +- .../client/src/license/license.controller.js | 11 +- .../client/src/license/license.partial.html | 52 +- awx/ui/client/src/lists/CompletedJobs.js | 21 +- awx/ui/client/src/lists/Credentials.js | 37 +- awx/ui/client/src/lists/Inventories.js | 41 +- awx/ui/client/src/lists/JobTemplates.js | 47 +- awx/ui/client/src/lists/PortalJobTemplates.js | 19 +- awx/ui/client/src/lists/PortalJobs.js | 15 +- awx/ui/client/src/lists/Projects.js | 34 +- awx/ui/client/src/lists/ScheduledJobs.js | 29 +- awx/ui/client/src/lists/Teams.js | 33 +- awx/ui/client/src/lists/Users.js | 33 +- .../login/loginModal/loginModal.partial.html | 8 +- .../src/main-menu/main-menu.partial.html | 34 +- .../management-jobs/card/card.partial.html | 8 +- .../notificationTemplates.form.js | 108 +- .../notificationTemplates.list.js | 30 +- .../src/notifications/notifications.list.js | 20 +- .../shared/type-change.service.js | 18 +- .../list/organizations-list.partial.html | 11 +- awx/ui/client/src/partials/breadcrumb.html | 4 +- awx/ui/client/src/partials/jobs.html | 8 +- .../portal-mode/portal-mode-jobs.partial.html | 6 +- .../src/setup-menu/setup-menu.partial.html | 36 +- awx/ui/client/src/shared/form-generator.js | 98 +- .../list-generator/list-generator.factory.js | 13 +- .../src/shared/socket/socket.service.js | 6 +- awx/ui/grunt-tasks/concurrent.js | 4 +- awx/ui/grunt-tasks/copy.js | 8 + awx/ui/grunt-tasks/nggettext_compile.js | 15 + awx/ui/grunt-tasks/nggettext_extract.js | 11 + awx/ui/package.json | 4 + awx/ui/po/ansible-tower.pot | 2041 +++++++++++++++++ awx/ui/webpack.config.js | 1 + 60 files changed, 3116 insertions(+), 805 deletions(-) create mode 100644 awx/ui/client/src/i18n.js create mode 100644 awx/ui/grunt-tasks/nggettext_compile.js create mode 100644 awx/ui/grunt-tasks/nggettext_extract.js create mode 100644 awx/ui/po/ansible-tower.pot diff --git a/Makefile b/Makefile index d74468a9e7..3112a2f4bd 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ SETUP_TAR_CHECKSUM=$(NAME)-setup-CHECKSUM # DEB build parameters DEBUILD_BIN ?= debuild -DEBUILD_OPTS = +DEBUILD_OPTS = DPUT_BIN ?= dput DPUT_OPTS ?= -c .dput.cf -u REPREPRO_BIN ?= reprepro @@ -506,6 +506,43 @@ test_jenkins : test_coverage # UI TASKS # -------------------------------------- +HAVE_PO := $(shell ls awx/ui/po/*.po 2>/dev/null) +check-po: +ifdef HAVE_PO + # Should be 'Language: zh-CN' but not 'Language: zh_CN' in zh_CN.po + for po in awx/ui/po/*.po ; do \ + echo $$po; \ + mo="awx/ui/po/`basename $$po .po`.mo"; \ + msgfmt --check --verbose $$po -o $$mo; \ + if test "$$?" -ne 0 ; then \ + exit -1; \ + fi; \ + rm $$mo; \ + name=`echo "$$po" | grep '-'`; \ + if test "x$$name" != x ; then \ + right_name=`echo $$language | sed -e 's/-/_/'`; \ + echo "ERROR: WRONG $$name CORRECTION: $$right_name"; \ + exit -1; \ + fi; \ + language=`grep '^"Language:' "$$po" | grep '_'`; \ + if test "x$$language" != x ; then \ + right_language=`echo $$language | sed -e 's/_/-/'`; \ + echo "ERROR: WRONG $$language CORRECTION: $$right_language in $$po"; \ + exit -1; \ + fi; \ + done; +else + @echo No PO files +endif + +# generate l10n .json +languages: awx/ui/package.json check-po + $(NPM_BIN) --prefix awx/ui run languages + +# generate .pot +pot: awx/ui/package.json + $(NPM_BIN) --prefix awx/ui run pot + ui-deps: $(UI_DEPS_FLAG_FILE) $(UI_DEPS_FLAG_FILE): awx/ui/package.json @@ -518,7 +555,7 @@ ui-docker-machine: $(UI_DEPS_FLAG_FILE) ui-docker: $(UI_DEPS_FLAG_FILE) $(NPM_BIN) --prefix awx/ui run build-docker-cid -ui-release: $(UI_RELEASE_FLAG_FILE) +ui-release: languages $(UI_RELEASE_FLAG_FILE) $(UI_RELEASE_FLAG_FILE): $(UI_DEPS_FLAG_FILE) $(NPM_BIN) --prefix awx/ui run build-release diff --git a/awx/ui/Gruntfile.js b/awx/ui/Gruntfile.js index 57fddad6ed..16b61f0405 100644 --- a/awx/ui/Gruntfile.js +++ b/awx/ui/Gruntfile.js @@ -16,6 +16,7 @@ module.exports = function(grunt) { // Project configuration. grunt.initConfig(configs); grunt.loadNpmTasks('grunt-newer'); + grunt.loadNpmTasks('grunt-angular-gettext'); // writes environment variables for development. current manages: // browser-sync + websocket proxy diff --git a/awx/ui/client/src/about/about.controller.js b/awx/ui/client/src/about/about.controller.js index 90824532db..2c821b9e09 100644 --- a/awx/ui/client/src/about/about.controller.js +++ b/awx/ui/client/src/about/about.controller.js @@ -1,5 +1,6 @@ export default - ['$scope', '$state', 'ConfigService', function($scope, $state, ConfigService){ + ['$scope', '$state', 'ConfigService', 'i18n', + function($scope, $state, ConfigService, i18n){ var processVersion = function(version){ // prettify version & calculate padding // e,g 3.0.0-0.git201602191743/ -> 3.0.0 @@ -20,6 +21,7 @@ export default .then(function(config){ $scope.subscription = config.license_info.subscription_name; $scope.version = processVersion(config.version); + $scope.version_str = i18n._("Version"); $('#about-modal').modal('show'); }); }; diff --git a/awx/ui/client/src/about/about.partial.html b/awx/ui/client/src/about/about.partial.html index 65cfd11f03..bcb2a5cd33 100644 --- a/awx/ui/client/src/about/about.partial.html +++ b/awx/ui/client/src/about/about.partial.html @@ -11,7 +11,7 @@ 
  ________________
-/  Tower Version \\
+/  Tower {{version_str}} \\
 \\{{version}}/
  ----------------
         \\   ^__^
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 6df9567b34..4e4f5b0b92 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -7,6 +7,7 @@
 // Vendor dependencies
 import 'jquery';
 import 'angular';
+import 'angular-gettext';
 import 'bootstrap';
 import 'jquery-ui';
 import 'bootstrap-datepicker';
@@ -79,6 +80,7 @@ import config from './shared/config/main';
 import './login/authenticationServices/pendo/ng-pendo';
 import footer from './footer/main';
 import scheduler from './scheduler/main';
+import {N_} from './i18n';
 
 var tower = angular.module('Tower', [
     // how to add CommonJS / AMD  third-party dependencies:
@@ -203,6 +205,8 @@ var tower = angular.module('Tower', [
     scheduler.name,
     'ApiModelHelper',
     'ActivityStreamHelper',
+    'gettext',
+    'I18N',
 ])
 
 .constant('AngularScheduler.partials', urlPrefix + 'lib/angular-scheduler/lib/')
@@ -237,6 +241,10 @@ var tower = angular.module('Tower', [
                 $state.go('dashboard');
             });
 
+            /* Mark translatable strings with N_() and
+             * extract them by 'grunt nggettext_extract'
+             * but angular.config() cannot get gettextCatalog.
+             */
             $stateProvider.
             state('teams', {
                 url: '/teams',
@@ -248,7 +256,7 @@ var tower = angular.module('Tower', [
                 },
                 ncyBreadcrumb: {
                     parent: 'setup',
-                    label: 'TEAMS'
+                    label: N_("TEAMS")
                 }
             }).
 
@@ -258,7 +266,7 @@ var tower = angular.module('Tower', [
                 controller: TeamsAdd,
                 ncyBreadcrumb: {
                     parent: "teams",
-                    label: "CREATE TEAM"
+                    label: N_("CREATE TEAM")
                 }
             }).
 
@@ -333,7 +341,7 @@ var tower = angular.module('Tower', [
                 },
                 ncyBreadcrumb: {
                     parent: 'setup',
-                    label: 'CREDENTIALS'
+                    label: N_("CREDENTIALS")
                 }
             }).
 
@@ -343,7 +351,7 @@ var tower = angular.module('Tower', [
                 controller: CredentialsAdd,
                 ncyBreadcrumb: {
                     parent: "credentials",
-                    label: "CREATE CREDENTIAL"
+                    label: N_("CREATE CREDENTIAL")
                 }
             }).
 
@@ -370,7 +378,7 @@ var tower = angular.module('Tower', [
                 },
                 ncyBreadcrumb: {
                     parent: 'setup',
-                    label: 'USERS'
+                    label: N_("USERS")
                 }
             }).
 
@@ -380,7 +388,7 @@ var tower = angular.module('Tower', [
                 controller: UsersAdd,
                 ncyBreadcrumb: {
                     parent: "users",
-                    label: "CREATE USER"
+                    label: N_("CREATE USER")
                 }
             }).
 
@@ -420,7 +428,7 @@ var tower = angular.module('Tower', [
                 templateUrl: urlPrefix + 'partials/sockets.html',
                 controller: SocketsController,
                 ncyBreadcrumb: {
-                    label: 'SOCKETS'
+                    label: N_("SOCKETS")
                 }
             });
         }
@@ -443,12 +451,12 @@ var tower = angular.module('Tower', [
     'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer',
     'ClearScope', 'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest',
     'Wait', 'ProcessErrors', '$state', 'GetBasePath', 'ConfigService',
-    'FeaturesService', '$filter', 'SocketService',
+    'FeaturesService', '$filter', 'SocketService', 'I18NInit',
     function($stateExtender, $q, $compile, $cookieStore, $rootScope, $log,
         CheckLicense, $location, Authorization, LoadBasePaths, Timer,
         ClearScope, LoadConfig, Store, pendoService, Prompt, Rest, Wait,
         ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
-        $filter, SocketService) {
+        $filter, SocketService, I18NInit) {
 
         $stateExtender.addState({
             name: 'dashboard',
@@ -466,7 +474,7 @@ var tower = angular.module('Tower', [
                 refreshButton: true
             },
             ncyBreadcrumb: {
-                label: "DASHBOARD"
+                label: N_("DASHBOARD")
             },
             resolve: {
                 graphData: ['$q', 'jobStatusGraphData', '$rootScope',
@@ -487,7 +495,7 @@ var tower = angular.module('Tower', [
             templateUrl: urlPrefix + 'partials/jobs.html',
             controller: JobsListController,
             ncyBreadcrumb: {
-                label: "JOBS"
+                label: N("JOBS")
             },
             params: {
                 search: {
@@ -512,7 +520,7 @@ var tower = angular.module('Tower', [
                 activityStreamTarget: 'project'
             },
             ncyBreadcrumb: {
-                label: "PROJECTS"
+                label: N("PROJECTS")
             },
             socket: {
                 "groups":{
@@ -528,7 +536,7 @@ var tower = angular.module('Tower', [
             controller: ProjectsAdd,
             ncyBreadcrumb: {
                 parent: "projects",
-                label: "CREATE PROJECT"
+                label: N("CREATE PROJECT")
             },
             socket: {
                 "groups":{
@@ -570,6 +578,8 @@ var tower = angular.module('Tower', [
             controller: OrganizationsAdd
         });
 
+        I18NInit();
+
         $rootScope.addPermission = function(scope) {
             $compile("")(scope);
         };
diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.partial.html b/awx/ui/client/src/bread-crumb/bread-crumb.partial.html
index 8e661904ba..4500556e96 100644
--- a/awx/ui/client/src/bread-crumb/bread-crumb.partial.html
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.partial.html
@@ -3,7 +3,7 @@
     

         
' + $filter('sanitize')(name) + '
',
+            hdr: i18n._('Delete'),
+            body: i18n._('
Are you sure you want to delete the project below?
') + '
' + $filter('sanitize')(name) + '
',
             action: action,
             actionText: 'DELETE'
         });
@@ -276,11 +277,11 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
         Rest.setUrl(url);
         Rest.post()
             .success(function () {
-                Alert('SCM Update Cancel', 'Your request to cancel the update was submitted to the task manager.', 'alert-info');
+                Alert(i18n._('SCM Update Cancel'), i18n._('Your request to cancel the update was submitted to the task manager.'), 'alert-info');
                 $scope.refresh();
             })
             .error(function (data, status) {
-                ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Call to ' + url + ' failed. POST status: ' + status });
+                ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'), msg: i18n.format(i18n._('Call to %s failed. POST status: '), url) + status });
             });
     });
 
@@ -296,12 +297,12 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
                 if (data.can_cancel) {
                     $scope.$emit('Cancel_Update', url);
                 } else {
-                    Alert('Cancel Not Allowed', '
Either you do not have access or the SCM update process completed. ' +
-                        'Click the Refresh button to view the latest status.
', 'alert-info', null, null, null, null, true);
+                    Alert(i18n._('Cancel Not Allowed'), i18n._('
Either you do not have access or the SCM update process completed. ' +
+                        'Click the Refresh button to view the latest status.
'), 'alert-info', null, null, null, null, true);
                 }
             })
             .error(function (data, status) {
-                ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Call to ' + url + ' failed. GET status: ' + status });
+                ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'), msg: i18n.format(i18n._('Call to %s failed. GET status: '), url) + status });
             });
     });
 
@@ -316,17 +317,17 @@ export function ProjectsList ($scope, $rootScope, $location, $log, $stateParams,
                             $scope.$emit('Check_Cancel', data);
                         })
                         .error(function (data, status) {
-                            ProcessErrors($scope, data, status, null, { hdr: 'Error!',
-                                msg: 'Call to ' + data.related.current_update + ' failed. GET status: ' + status });
+                            ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'),
+                                msg: i18n.format(i18n._('Call to %s failed. GET status: '), data.related.current_update) + status });
                         });
                 } else {
-                    Alert('Update Not Found', '
An SCM update does not appear to be running for project: ' + $filter('sanitize')(name) + '. Click the Refresh ' +
-                        'button to view the latest status.
', 'alert-info',undefined,undefined,undefined,undefined,true);
+                    Alert(i18n._('Update Not Found'), i18n.format(i18n._('
An SCM update does not appear to be running for project: %s. Click the Refresh ' +
+                        'button to view the latest status.
'), $filter('sanitize')(name)), 'alert-info',undefined,undefined,undefined,undefined,true);
                 }
             })
             .error(function (data, status) {
-                ProcessErrors($scope, data, status, null, { hdr: 'Error!',
-                    msg: 'Call to get project failed. GET status: ' + status });
+                ProcessErrors($scope, data, status, null, { hdr: i18n._('Error!'),
+                    msg: i18n._('Call to get project failed. GET status: ') + status });
             });
     };
 
@@ -371,7 +372,8 @@ ProjectsList.$inject = ['$scope', '$rootScope', '$location', '$log',
     'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
     'ProcessErrors', 'GetBasePath', 'SelectionInit', 'ProjectUpdate',
     'Refresh', 'Wait', 'GetChoices', 'Empty', 'Find',
-    'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService'
+    'GetProjectIcon', 'GetProjectToolTip', '$filter', '$state', 'rbacUiControlService',
+    'i18n'
 ];
 
 
@@ -379,7 +381,7 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
     $stateParams, ProjectsForm, GenerateForm, Rest, Alert, ProcessErrors,
     ClearScope, GetBasePath, ReturnToCaller, GetProjectPath, LookUpInit,
     OrganizationList, CredentialList, GetChoices, DebugForm, Wait, $state,
-    CreateSelect2) {
+    CreateSelect2, i18n) {
 
     Rest.setUrl(GetBasePath('projects'));
     Rest.options()
@@ -504,8 +506,8 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
             })
             .error(function (data, status) {
                 Wait('stop');
-                ProcessErrors($scope, data, status, form, { hdr: 'Error!',
-                    msg: 'Failed to create new project. POST returned status: ' + status });
+                ProcessErrors($scope, data, status, form, { hdr: i18n._('Error!'),
+                    msg: i18n._('Failed to create new project. POST returned status: ') + status });
             });
     };
 
@@ -521,27 +523,27 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
         if($scope.scm_type.value) {
             switch ($scope.scm_type.value) {
                 case 'git':
-                    $scope.urlPopover = '
Example URLs for GIT SCM include:
  • https://github.com/ansible/ansible.git
    • ' +
+                    $scope.urlPopover = i18n._('
    Example URLs for GIT SCM include:
    • https://github.com/ansible/ansible.git
      • ' +
                         '
    • git@github.com:ansible/ansible.git
    • git://servername.example.com/ansible.git
    ' +
                         '
    Note: When using SSH protocol for GitHub or Bitbucket, enter an SSH key only, ' +
                         'do not enter a username (other than git). Additionally, GitHub and Bitbucket do not support password authentication when using ' +
-                        'SSH. GIT read only protocol (git://) does not use username or password information.';
+                        'SSH. GIT read only protocol (git://) does not use username or password information.');
                 break;
                 case 'svn':
-                    $scope.urlPopover = '
    Example URLs for Subversion SCM include:
    ' +
+                    $scope.urlPopover = i18n._('
    Example URLs for Subversion SCM include:
    ' +
                         '
    • https://github.com/ansible/ansible
    • svn://servername.example.com/path
      • ' +
-                        '
    • svn+ssh://servername.example.com/path
    ';
+                        '
  • svn+ssh://servername.example.com/path
');
                     break;
                 case 'hg':
-                    $scope.urlPopover = '
Example URLs for Mercurial SCM include:
' +
+                    $scope.urlPopover = i18n._('
Example URLs for Mercurial SCM include:
' +
                         '
  • https://bitbucket.org/username/project
  • ssh://hg@bitbucket.org/username/project
    • ' +
                         '
  • ssh://server.example.com/path
' +
                         '
Note: Mercurial does not support password authentication for SSH. ' +
                         'Do not put the username and key in the URL. ' +
-                        'If using Bitbucket and SSH, do not supply your Bitbucket username.';
+                        'If using Bitbucket and SSH, do not supply your Bitbucket username.');
                     break;
                 default:
-                    $scope.urlPopover = '
 URL popover text';
+                    $scope.urlPopover = i18n._('
 URL popover text');
             }
         }
 
@@ -556,7 +558,7 @@ ProjectsAdd.$inject = ['Refresh', '$scope', '$rootScope', '$compile', '$location
     '$stateParams', 'ProjectsForm', 'GenerateForm', 'Rest', 'Alert',
     'ProcessErrors', 'ClearScope', 'GetBasePath', 'ReturnToCaller',
     'GetProjectPath', 'LookUpInit', 'OrganizationList', 'CredentialList',
-    'GetChoices', 'DebugForm', 'Wait', '$state', 'CreateSelect2'
+    'GetChoices', 'DebugForm', 'Wait', '$state', 'CreateSelect2', 'i18n'
 ];
 
 
@@ -566,7 +568,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
     ReturnToCaller, GetProjectPath, Authorization, CredentialList, LookUpInit,
     GetChoices, Empty, DebugForm, Wait, SchedulesControllerInit,
     SchedulesListInit, SchedulesList, ProjectUpdate, $state, CreateSelect2,
-    OrganizationList, NotificationsListInit, ToggleNotification) {
+    OrganizationList, NotificationsListInit, ToggleNotification, i18n) {
 
     ClearScope('htmlTemplate');
 
@@ -769,8 +771,8 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
                 $scope.$emit('projectLoaded');
             })
             .error(function (data, status) {
-                ProcessErrors($scope, data, status, form, { hdr: 'Error!',
-                    msg: 'Failed to retrieve project: ' + id + '. GET status: ' + status
+                ProcessErrors($scope, data, status, form, { hdr: i18n._('Error!'),
+                    msg: i18n._('Failed to retrieve project: ') + id + i18n._('. GET status: ') + status
                 });
             });
     });
@@ -871,8 +873,8 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
         };
 
         Prompt({
-            hdr: 'Delete',
-            body: '
Are you sure you want to remove the ' + title + ' below from ' + $scope.name + '?
' + name + '
',
+            hdr: i18n._('Delete'),
+            body: i18n.format(i18n._('
Are you sure you want to remove the %s below from %s?
'), title, $scope.name) + '
' + name + '
',
             action: action,
             actionText: 'DELETE'
         });
@@ -889,27 +891,27 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
         if($scope.scm_type.value) {
             switch ($scope.scm_type.value) {
                 case 'git':
-                    $scope.urlPopover = '
Example URLs for GIT SCM include:
  • https://github.com/ansible/ansible.git
    • ' +
+                    $scope.urlPopover = i18n._('
    Example URLs for GIT SCM include:
    • https://github.com/ansible/ansible.git
      • ' +
                         '
    • git@github.com:ansible/ansible.git
    • git://servername.example.com/ansible.git
    ' +
                         '
    Note: When using SSH protocol for GitHub or Bitbucket, enter an SSH key only, ' +
                         'do not enter a username (other than git). Additionally, GitHub and Bitbucket do not support password authentication when using ' +
-                        'SSH. GIT read only protocol (git://) does not use username or password information.';
+                        'SSH. GIT read only protocol (git://) does not use username or password information.');
                 break;
                 case 'svn':
-                    $scope.urlPopover = '
    Example URLs for Subversion SCM include:
    ' +
+                    $scope.urlPopover = i18n._('
    Example URLs for Subversion SCM include:
    ' +
                         '
    • https://github.com/ansible/ansible
    • svn://servername.example.com/path
      • ' +
-                        '
    • svn+ssh://servername.example.com/path
    ';
+                        '
  • svn+ssh://servername.example.com/path
');
                     break;
                 case 'hg':
-                    $scope.urlPopover = '
Example URLs for Mercurial SCM include:
' +
+                    $scope.urlPopover = i18n._('
Example URLs for Mercurial SCM include:
' +
                         '
  • https://bitbucket.org/username/project
  • ssh://hg@bitbucket.org/username/project
    • ' +
                         '
  • ssh://server.example.com/path
' +
                         '
Note: Mercurial does not support password authentication for SSH. ' +
                         'Do not put the username and key in the URL. ' +
-                        'If using Bitbucket and SSH, do not supply your Bitbucket username.';
+                        'If using Bitbucket and SSH, do not supply your Bitbucket username.');
                     break;
                 default:
-                    $scope.urlPopover = '
 URL popover text';
+                    $scope.urlPopover = i18n._('
 URL popover text');
             }
         }
     };
@@ -918,7 +920,7 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
         if ($scope.project_obj.scm_type === "Manual" || Empty($scope.project_obj.scm_type)) {
             // ignore
         } else if ($scope.project_obj.status === 'updating' || $scope.project_obj.status === 'running' || $scope.project_obj.status === 'pending') {
-            Alert('Update in Progress', 'The SCM update process is running.', 'alert-info');
+            Alert('Update in Progress', i18n._('The SCM update process is running.'), 'alert-info');
         } else {
             ProjectUpdate({ scope: $scope, project_id: $scope.project_obj.id });
         }
@@ -936,5 +938,5 @@ ProjectsEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
     'Authorization', 'CredentialList', 'LookUpInit', 'GetChoices', 'Empty',
     'DebugForm', 'Wait', 'SchedulesControllerInit', 'SchedulesListInit',
     'SchedulesList', 'ProjectUpdate', '$state', 'CreateSelect2',
-    'OrganizationList', 'NotificationsListInit', 'ToggleNotification'
+    'OrganizationList', 'NotificationsListInit', 'ToggleNotification', 'i18n'
 ];
diff --git a/awx/ui/client/src/controllers/Users.js b/awx/ui/client/src/controllers/Users.js
index eb55a1bbb2..ee7ed6f431 100644
--- a/awx/ui/client/src/controllers/Users.js
+++ b/awx/ui/client/src/controllers/Users.js
@@ -10,10 +10,12 @@
  * @description This controller's the Users page
 */
 
+import {N_} from "../i18n";
+
 const user_type_options = [
-    {type: 'normal'              , label: 'Normal User'          },
-    {type: 'system_auditor'      , label: 'System Auditor'       },
-    {type: 'system_administrator', label: 'System Administrator' },
+    {type: 'normal'              , label: N_('Normal User')          },
+    {type: 'system_auditor'      , label: N_('System Auditor')       },
+    {type: 'system_administrator', label: N_('System Administrator') },
 ];
 
 function user_type_sync($scope) {
@@ -34,7 +36,12 @@ function user_type_sync($scope) {
 export function UsersList($scope, $rootScope, $location, $log, $stateParams,
     Rest, Alert, UserList, GenerateList, Prompt, SearchInit, PaginateInit,
     ReturnToCaller, ClearScope, ProcessErrors, GetBasePath, SelectionInit,
-    Wait, $state, Refresh, $filter, rbacUiControlService) {
+    Wait, $state, Refresh, $filter, rbacUiControlService, i18n) {
+
+    for (var i = 0; i < user_type_options.length; i++) {
+        user_type_options[i].label = i18n._(user_type_options[i].label);
+    }
+
     ClearScope();
 
     $scope.canAdd = false;
@@ -142,7 +149,7 @@ UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
     '$stateParams', 'Rest', 'Alert', 'UserList', 'generateList', 'Prompt',
     'SearchInit', 'PaginateInit', 'ReturnToCaller', 'ClearScope',
     'ProcessErrors', 'GetBasePath', 'SelectionInit', 'Wait', '$state',
-    'Refresh', '$filter', 'rbacUiControlService'
+    'Refresh', '$filter', 'rbacUiControlService', 'i18n'
 ];
 
 
@@ -152,7 +159,11 @@ UsersList.$inject = ['$scope', '$rootScope', '$location', '$log',
 export function UsersAdd($scope, $rootScope, $compile, $location, $log,
     $stateParams, UserForm, GenerateForm, Rest, Alert, ProcessErrors,
     ReturnToCaller, ClearScope, GetBasePath, LookUpInit, OrganizationList,
-    ResetForm, Wait, CreateSelect2, $state) {
+    ResetForm, Wait, CreateSelect2, $state, i18n) {
+
+    for (var i = 0; i < user_type_options.length; i++) {
+        user_type_options[i].label = i18n._(user_type_options[i].label);
+    }
 
     Rest.setUrl(GetBasePath('users'));
     Rest.options()
@@ -268,14 +279,19 @@ export function UsersAdd($scope, $rootScope, $compile, $location, $log,
 UsersAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log',
     '$stateParams', 'UserForm', 'GenerateForm', 'Rest', 'Alert',
     'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath',
-    'LookUpInit', 'OrganizationList', 'ResetForm', 'Wait', 'CreateSelect2', '$state'
+    'LookUpInit', 'OrganizationList', 'ResetForm', 'Wait', 'CreateSelect2', '$state',
+    'i18n'
 ];
 
 
 export function UsersEdit($scope, $rootScope, $location,
     $stateParams, UserForm, GenerateForm, Rest, ProcessErrors,
     RelatedSearchInit, RelatedPaginateInit, ClearScope,
-    GetBasePath, ResetForm, Wait, CreateSelect2 ,$state) {
+    GetBasePath, ResetForm, Wait, CreateSelect2 ,$state, i18n) {
+
+    for (var i = 0; i < user_type_options.length; i++) {
+        user_type_options[i].label = i18n._(user_type_options[i].label);
+    }
 
     ClearScope();
 
@@ -439,5 +455,5 @@ export function UsersEdit($scope, $rootScope, $location,
 UsersEdit.$inject = ['$scope', '$rootScope', '$location',
     '$stateParams', 'UserForm', 'GenerateForm', 'Rest', 'ProcessErrors',
     'RelatedSearchInit', 'RelatedPaginateInit', 'ClearScope', 'GetBasePath',
-    'ResetForm', 'Wait', 'CreateSelect2', '$state'
+    'ResetForm', 'Wait', 'CreateSelect2', '$state', 'i18n'
 ];
diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js b/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js
index f3e4a0ad20..246ccb3a68 100644
--- a/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js
+++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.directive.js
@@ -1,7 +1,8 @@
 /* jshint unused: vars */
 export default
     [   'templateUrl',
-        function(templateUrl) {
+        'i18n',
+        function(templateUrl, i18n) {
             return {
                 restrict: 'E',
                 scope: {
@@ -35,34 +36,34 @@ export default
                             {
                                 url: "/#/home/hosts",
                                 number: scope.data.hosts.total,
-                                label: "Hosts"
+                                label: i18n._("Hosts")
                             },
                             {
                                 url: "/#/home/hosts?active-failures=true",
                                 number: scope.data.hosts.failed,
-                                label: "Failed Hosts",
+                                label: i18n._("Failed Hosts"),
                                 isFailureCount: true
                             },
                             {
                                 url: "/#/inventories",
                                 number: scope.data.inventories.total,
-                                label: "Inventories",
+                                label: i18n._("Inventories"),
                             },
                             {
                                 url: "/#/inventories?status=sync-failed",
                                 number: scope.data.inventories.inventory_failed,
-                                label: "Inventory Sync Failures",
+                                label: i18n._("Inventory Sync Failures"),
                                 isFailureCount: true
                             },
                             {
                                 url: "/#/projects",
                                 number: scope.data.projects.total,
-                                label: "Projects"
+                                label: i18n._("Projects")
                             },
                             {
                                 url: "/#/projects?status=failed,canceled",
                                 number: scope.data.projects.failed,
-                                label: "Project Sync Failures",
+                                label: i18n._("Project Sync Failures"),
                                 isFailureCount: true
                             }
                         ], function(val) { return addFailureToCount(val); });
diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
index 3cbbf34c49..7a818c704d 100644
--- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
+++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
@@ -1,68 +1,68 @@
 

     

         

-            JOB STATUS
+            JOB STATUS
         

         

             

-                
Period

+                
Period

                 

                     
-                        Past Month 
+                        Past Month 
                     
                     
                 

             

             

-                
Job Type

+                
Job Type

                 

 
                         
-                            All 
+                            All 
                         
 
                     
                 

             

             

-                
View

+                
View

                 

                     
-                        All
+                        All
                         
                         
@@ -71,13 +71,13 @@
                     
                 

diff --git a/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js b/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js
index 76176cf708..8202fbc21d 100644
--- a/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js
+++ b/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js
@@ -13,10 +13,11 @@
         'adjustGraphSize',
         'jobStatusGraphData',
         'templateUrl',
+        'i18n',
         JobStatusGraph
     ];
 
-function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustGraphSize, graphDataService, templateUrl) {
+function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustGraphSize, graphDataService, templateUrl, i18n) {
             return {
                 restrict: 'E',
                 scope: {
@@ -60,10 +61,10 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG
 
                     var timeFormat, graphData = [
                         {   "color": "#5CB85C",
-                            "key": "SUCCESSFUL",
+                            "key": i18n._("SUCCESSFUL"),
                             "values": data.jobs.successful
                         },
-                        {   "key" : "FAILED" ,
+                        {   "key" : i18n._("FAILED") ,
                             "color" : "#D9534F",
                             "values": data.jobs.failed
                         }
@@ -102,14 +103,14 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG
                     job_status_chart.interactiveLayer.tooltip.distance(-1); //distance from interactive line to tooltip
 
                     job_status_chart.xAxis
-                    .axisLabel("TIME")//.showMaxMin(true)
+                    .axisLabel(i18n._("TIME"))//.showMaxMin(true)
                     .tickFormat(function(d) {
                         var dx = graphData[0].values[d] && graphData[0].values[d].x || 0;
                         return dx ? d3.time.format(timeFormat)(new Date(Number(dx+'000'))) : '';
                     });
 
                     job_status_chart.yAxis     //Chart y-axis settings
-                    .axisLabel('JOBS')
+                    .axisLabel(i18n._('JOBS'))
                     .tickFormat(d3.format('.f'));
 
                     d3.select(element.find('svg')[0])
diff --git a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js
index e34a051588..eb312af291 100644
--- a/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js
+++ b/awx/ui/client/src/dashboard/hosts/dashboard-hosts.list.js
@@ -5,17 +5,17 @@
 *************************************************/
 
 
-export default function(){
+export default [ 'i18n', function(i18n){
     return {
         name: 'hosts',
         iterator: 'host',
-        selectTitle: 'Add Existing Hosts',
+        selectTitle: i18n._('Add Existing Hosts'),
         editTitle: 'Hosts',
         listTitle: 'Hosts',
         index: false,
         hover: true,
         well: true,
-        emptyListText: 'NO HOSTS FOUND',
+        emptyListText: i18n._('NO HOSTS FOUND'),
         fields: {
             status: {
                 basePath: 'unified_jobs',
@@ -91,4 +91,4 @@ export default function(){
 
         }
     };
-}
+}];
diff --git a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
index 9215dc8332..8114f037d4 100644
--- a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
+++ b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
@@ -1,23 +1,23 @@
 

     

         

-            RECENTLY USED JOB TEMPLATES
+            RECENTLY USED JOB TEMPLATES
         

         
-            VIEW ALL
+            VIEW ALL
         
     

     

         

         

-            RECENTLY USED JOB TEMPLATES
+            RECENTLY USED JOB TEMPLATES
         

     

-        
No job templates were recently used.

+        
No job templates were recently used.

         You can create a job template here.

     

diff --git a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
index 8d6811a5ec..725675377c 100644
--- a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
+++ b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
@@ -1,17 +1,17 @@
 

     

         

-            RECENT JOB RUNS
+            RECENT JOB RUNS
         

         
-            VIEW ALL
+            VIEW ALL
         
     

     

         

            

                 
-                        Name
+                        Name
                 
                 
-                  Activity
+                  Activity
                 
                 
-                  Actions
+                  Actions
                 
            

            

     
     
 

-              
-              
+              
+              

         

-            RECENTLY RUN JOBS
+            RECENTLY RUN JOBS
         

     

-        
No jobs were recently run.

+        
No jobs were recently run.

     

diff --git a/awx/ui/client/src/forms/Credentials.js b/awx/ui/client/src/forms/Credentials.js
index abcbbd476d..eb4a61b923 100644
--- a/awx/ui/client/src/forms/Credentials.js
+++ b/awx/ui/client/src/forms/Credentials.js
@@ -12,14 +12,15 @@
 
 export default
     angular.module('CredentialFormDefinition', [])
-        .value('CredentialForm', {
+        .factory('CredentialForm', ['i18n', function(i18n) {
+        return {
 
-            addTitle: 'Create Credential', //Legend in add mode
+            addTitle: i18n._('Create Credential'), //Legend in add mode
             editTitle: '{{ name }}', //Legend in edit mode
             name: 'credential',
             forceListeners: true,
             subFormTitles: {
-                credentialSubForm: 'Type Details',
+                credentialSubForm: i18n._('Type Details'),
             },
 
             actions: {
@@ -28,7 +29,7 @@ export default
 
             fields: {
                 name: {
-                    label: 'Name',
+                    label: i18n._('Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -36,7 +37,7 @@ export default
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 description: {
-                    label: 'Description',
+                    label: i18n._('Description'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
@@ -46,26 +47,26 @@ export default
                     addRequired: false,
                     editRequired: false,
                     ngShow: 'canShareCredential',
-                    label: 'Organization',
+                    label: i18n._('Organization'),
                     type: 'lookup',
                     sourceModel: 'organization',
                     sourceField: 'name',
                     ngClick: 'lookUpOrganization()',
-                    awPopOver: "
If no organization is given, the credential can only be used by the user that creates the credential.  Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.
",
-                    dataTitle: 'Organization ',
+                    awPopOver: i18n._("
If no organization is given, the credential can only be used by the user that creates the credential.  Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.
"),
+                    dataTitle: i18n._('Organization') + ' ',
                     dataPlacement: 'bottom',
                     dataContainer: "body",
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 kind: {
-                    label: 'Type',
+                    label: i18n._('Type'),
                     excludeModal: true,
                     type: 'select',
                     ngOptions: 'kind.label for kind in credential_kind_options track by kind.value', //  select as label for value in array 'kind.label for kind in credential_kind_options',
                     ngChange: 'kindChange()',
                     addRequired: true,
                     editRequired: true,
-                    awPopOver:'
\n' +
+                    awPopOver: i18n._('
\n' +
                             '
Machine
\n' +
                             '
Authentication for remote machine access. This can include SSH keys, usernames, passwords, ' +
                             'and sudo information. Machine credentials are used when submitting jobs to run playbooks against ' +
@@ -82,15 +83,15 @@ export default
                             '
Usernames, passwords, and access keys for authenticating to the specified cloud or infrastructure ' +
                             'provider. These are used for dynamic inventory sources and for cloud provisioning and deployment ' +
                             'in playbook runs.
\n' +
-                            '
\n',
-                    dataTitle: 'Type',
+                            '
\n'),
+                    dataTitle: i18n._('Type'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     hasSubForm: true,
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 access_key: {
-                    label: 'Access Key',
+                    label: i18n._('Access Key'),
                     type: 'text',
                     ngShow: "kind.value == 'aws'",
                     awRequiredWhen: {
@@ -103,7 +104,7 @@ export default
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 secret_key: {
-                    label: 'Secret Key',
+                    label: i18n._('Secret Key'),
                     type: 'sensitive',
                     ngShow: "kind.value == 'aws'",
                     ngDisabled: "secret_key_ask || !(credential_obj.summary_fields.user_capabilities.edit || canAdd)",
@@ -118,14 +119,14 @@ export default
                     subForm: 'credentialSubForm'
                 },
                 security_token: {
-                    label: 'STS Token',
+                    label: i18n._('STS Token'),
                     type: 'sensitive',
                     ngShow: "kind.value == 'aws'",
                     autocomplete: false,
                     apiField: 'security_token',
-                    awPopOver: "
Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users.
To learn more about the IAM STS Token, refer to the Amazon documentation.
",
+                    awPopOver: i18n._("
Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users.
To learn more about the IAM STS Token, refer to the Amazon documentation.
"),
                     hasShowInputButton: true,
-                    dataTitle: 'STS Token',
+                    dataTitle: i18n._('STS Token'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subForm: 'credentialSubForm',
@@ -136,8 +137,8 @@ export default
                     type: 'text',
                     ngShow: "kind.value == 'vmware' || kind.value == 'openstack' || kind.value === 'satellite6' || kind.value === 'cloudforms'",
                     awPopOverWatch: "hostPopOver",
-                    awPopOver: "set in helpers/credentials",
-                    dataTitle: 'Host',
+                    awPopOver: i18n._("set in helpers/credentials"),
+                    dataTitle: i18n._('Host'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     autocomplete: false,
@@ -149,7 +150,7 @@ export default
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 "subscription": {
-                    label: "Subscription ID",
+                    label: i18n._("Subscription ID"),
                     type: 'text',
                     ngShow: "kind.value == 'azure' || kind.value == 'azure_rm'",
                     awRequiredWhen: {
@@ -159,8 +160,8 @@ export default
                     addRequired: false,
                     editRequired: false,
                     autocomplete: false,
-                    awPopOver: '
Subscription ID is an Azure construct, which is mapped to a username.
',
-                    dataTitle: 'Subscription ID',
+                    awPopOver: i18n._('
Subscription ID is an Azure construct, which is mapped to a username.
'),
+                    dataTitle: i18n._('Subscription ID'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subForm: 'credentialSubForm',
@@ -188,15 +189,15 @@ export default
                         init: false
                     },
                     autocomplete: false,
-                    awPopOver: '
The email address assigned to the Google Compute Engine service account.
',
-                    dataTitle: 'Email',
+                    awPopOver: i18n._('
The email address assigned to the Google Compute Engine service account.
'),
+                    dataTitle: i18n._('Email'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subForm: 'credentialSubForm',
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 "api_key": {
-                    label: 'API Key',
+                    label: i18n._('API Key'),
                     type: 'sensitive',
                     ngShow: "kind.value == 'rax'",
                     awRequiredWhen: {
@@ -224,7 +225,7 @@ export default
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 "ssh_password": {
-                    label: 'Password',
+                    label: i18n._('Password'),
                     type: 'sensitive',
                     ngShow: "kind.value == 'ssh'",
                     ngDisabled: "ssh_password_ask || !(credential_obj.summary_fields.user_capabilities.edit || canAdd)",
@@ -232,7 +233,7 @@ export default
                     editRequired: false,
                     subCheckbox: {
                         variable: 'ssh_password_ask',
-                        text: 'Ask at runtime?',
+                        text: i18n._('Ask at runtime?'),
                         ngChange: 'ask(\'ssh_password\', \'undefined\')'
                     },
                     hasShowInputButton: true,
@@ -254,16 +255,16 @@ export default
                     editRequired: false,
                     awDropFile: true,
                     rows: 10,
-                    awPopOver: "SSH key description",
+                    awPopOver: i18n._("SSH key description"),
                     awPopOverWatch:   "key_description",
-                    dataTitle: 'Private Key',
+                    dataTitle: i18n._('Private Key'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subForm: "credentialSubForm",
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 "ssh_key_unlock": {
-                    label: 'Private Key Passphrase',
+                    label: i18n._('Private Key Passphrase'),
                     type: 'sensitive',
                     ngShow: "kind.value == 'ssh' || kind.value == 'scm'",
                     addRequired: false,
@@ -272,7 +273,7 @@ export default
                     subCheckbox: {
                         variable: 'ssh_key_unlock_ask',
                         ngShow: "kind.value == 'ssh'",
-                        text: 'Ask at runtime?',
+                        text: i18n._('Ask at runtime?'),
                         ngChange: 'ask(\'ssh_key_unlock\', \'undefined\')',
                         ngDisabled: "keyEntered === false"
                     },
@@ -280,15 +281,15 @@ export default
                     subForm: 'credentialSubForm'
                 },
                 "become_method": {
-                    label: "Privilege Escalation",
+                    label: i18n._("Privilege Escalation"),
                     // hintText: "If your playbooks use privilege escalation (\"sudo: true\", \"su: true\", etc), you can specify the username to become, and the password to use here.",
                     type: 'select',
                     ngShow: "kind.value == 'ssh'",
-                    dataTitle: 'Privilege Escalation',
+                    dataTitle: i18n._('Privilege Escalation'),
                     ngOptions: 'become.label for become in become_options track by become.value',
-                    awPopOver: "
Specify a method for 'become' operations. " +
+                    awPopOver: i18n._("
Specify a method for 'become' operations. " +
                     "This is equivalent to specifying the --become-method=BECOME_METHOD parameter, where BECOME_METHOD could be "+
-                    "sudo | su | pbrun | pfexec | runas 
(defaults to sudo)
",
+                    "sudo | su | pbrun | pfexec | runas
(defaults to sudo)
"),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subForm: 'credentialSubForm',
@@ -313,7 +314,7 @@ export default
                     editRequired: false,
                     subCheckbox: {
                         variable: 'become_password_ask',
-                        text: 'Ask at runtime?',
+                        text: i18n._('Ask at runtime?'),
                         ngChange: 'ask(\'become_password\', \'undefined\')'
                     },
                     hasShowInputButton: true,
@@ -322,7 +323,7 @@ export default
                 },
                 client:{
                     type: 'text',
-                    label: 'Client ID',
+                    label: i18n._('Client ID'),
                     subForm: 'credentialSubForm',
                     ngShow: "kind.value === 'azure_rm'",
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
@@ -331,20 +332,20 @@ export default
                     type: 'sensitive',
                     hasShowInputButton: true,
                     autocomplete: false,
-                    label: 'Client Secret',
+                    label: i18n._('Client Secret'),
                     subForm: 'credentialSubForm',
                     ngShow: "kind.value === 'azure_rm'",
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 tenant: {
                     type: 'text',
-                    label: 'Tenant ID',
+                    label: i18n._('Tenant ID'),
                     subForm: 'credentialSubForm',
                     ngShow: "kind.value === 'azure_rm'",
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 authorize: {
-                    label: 'Authorize',
+                    label: i18n._('Authorize'),
                     type: 'checkbox',
                     ngChange: "toggleCallback('host_config_key')",
                     subForm: 'credentialSubForm',
@@ -352,7 +353,7 @@ export default
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 authorize_password: {
-                    label: 'Authorize Password',
+                    label: i18n._('Authorize Password'),
                     type: 'sensitive',
                     hasShowInputButton: true,
                     autocomplete: false,
@@ -365,8 +366,8 @@ export default
                     type: 'text',
                     ngShow: "kind.value == 'gce' || kind.value == 'openstack'",
                     awPopOverWatch: "projectPopOver",
-                    awPopOver: "set in helpers/credentials",
-                    dataTitle: 'Project Name',
+                    awPopOver: i18n._("set in helpers/credentials"),
+                    dataTitle: i18n._('Project Name'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     addRequired: false,
@@ -382,12 +383,12 @@ export default
                     labelBind: 'domainLabel',
                     type: 'text',
                     ngShow: "kind.value == 'openstack'",
-                    awPopOver: "
OpenStack domains define administrative " +
+                    awPopOver: i18n._("
OpenStack domains define administrative " +
                     "boundaries. It is only needed for Keystone v3 authentication URLs. " +
                     "Common scenarios include:
  • v2 URLs - leave blank
    • " +
                     "
  • v3 default - set to 'default'
    • " +
-                    "
  • v3 multi-domain - your domain name
",
-                    dataTitle: 'Domain Name',
+                    "
  • v3 multi-domain - your domain name
    • "),
+                    dataTitle: i18n._('Domain Name'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     addRequired: false,
@@ -396,7 +397,7 @@ export default
                     ngDisabled: '!(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 "vault_password": {
-                    label: "Vault Password",
+                    label: i18n._("Vault Password"),
                     type: 'sensitive',
                     ngShow: "kind.value == 'ssh'",
                     ngDisabled: "vault_password_ask || !(credential_obj.summary_fields.user_capabilities.edit || canAdd)",
@@ -404,7 +405,7 @@ export default
                     editRequired: false,
                     subCheckbox: {
                         variable: 'vault_password_ask',
-                        text: 'Ask at runtime?',
+                        text: i18n._('Ask at runtime?'),
                         ngChange: 'ask(\'vault_password\', \'undefined\')'
                     },
                     hasShowInputButton: true,
@@ -438,7 +439,7 @@ export default
                     dataPlacement: 'top',
                     basePath: 'credentials/:id/access_list/',
                     type: 'collection',
-                    title: 'Permissions',
+                    title: i18n._('Permissions'),
                     iterator: 'permission',
                     index: false,
                     open: false,
@@ -447,9 +448,9 @@ export default
                         add: {
                             ngClick: "addPermission",
                             label: 'Add',
-                            awToolTip: 'Add a permission',
+                            awToolTip: i18n._('Add a permission'),
                             actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '+ ADD',
+                            buttonContent: i18n._('+ ADD'),
                             ngShow: '(credential_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
@@ -457,19 +458,19 @@ export default
                     fields: {
                         username: {
                             key: true,
-                            label: 'User',
+                            label: i18n._('User'),
                             linkBase: 'users',
                             class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
                         },
                         role: {
-                            label: 'Role',
+                            label: i18n._('Role'),
                             type: 'role',
                             noSort: true,
                             class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
                             searchable: false
                         },
                         team_roles: {
-                            label: 'Team Roles',
+                            label: i18n._('Team Roles'),
                             type: 'team_roles',
                             noSort: true,
                             class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
@@ -487,4 +488,4 @@ export default
                     }
                 };
             }
-        });
+        };}]);
diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js
index 72852079c3..0207124476 100644
--- a/awx/ui/client/src/forms/Inventories.js
+++ b/awx/ui/client/src/forms/Inventories.js
@@ -12,9 +12,10 @@
 
 export default
     angular.module('InventoryFormDefinition', ['ScanJobsListDefinition'])
-        .value('InventoryFormObject', {
+        .factory('InventoryFormObject', ['i18n', function(i18n) {
+        return {
 
-            addTitle: 'New Inventory',
+            addTitle: i18n._('New Inventory'),
             editTitle: '{{ inventory_name }}',
             name: 'inventory',
             tabs: true,
@@ -22,7 +23,7 @@ export default
             fields: {
                 inventory_name: {
                     realName: 'name',
-                    label: 'Name',
+                    label: i18n._('Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -31,14 +32,14 @@ export default
                 },
                 inventory_description: {
                     realName: 'description',
-                    label: 'Description',
+                    label: i18n._('Description'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
                     ngDisabled: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 organization: {
-                    label: 'Organization',
+                    label: i18n._('Organization'),
                     type: 'lookup',
                     sourceModel: 'organization',
                     sourceField: 'name',
@@ -50,21 +51,21 @@ export default
                     ngDisabled: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 variables: {
-                    label: 'Variables',
+                    label: i18n._('Variables'),
                     type: 'textarea',
                     class: 'Form-formGroup--fullWidth',
                     addRequired: false,
                     editRequird: false,
                     rows: 6,
                     "default": "---",
-                    awPopOver: "
    Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.
    " +
+                    awPopOver: i18n._("
    Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.
    " +
                         "JSON:
    \n" +
                         "
    {
     \"somevar\": \"somevalue\",
     \"password\": \"magic\"
     }
    \n" +
                         "YAML:
    \n" +
                         "
    ---
    somevar: somevalue
    password: magic
    \n" +
                         '
    View JSON examples at www.json.org
    ' +
-                        '
    View YAML examples at docs.ansible.com
    ',
-                    dataTitle: 'Inventory Variables',
+                        '
    View YAML examples at docs.ansible.com
    '),
+                    dataTitle: i18n._('Inventory Variables'),
                     dataPlacement: 'right',
                     dataContainer: 'body',
                     ngDisabled: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)' // TODO: get working
@@ -89,11 +90,11 @@ export default
 
             related: {
                 permissions: {
-                    awToolTip: 'Please save before assigning permissions',
+                    awToolTip: i18n._('Please save before assigning permissions'),
                     dataPlacement: 'top',
                     basePath: 'inventories/:id/access_list/',
                     type: 'collection',
-                    title: 'Permissions',
+                    title: i18n._('Permissions'),
                     iterator: 'permission',
                     index: false,
                     open: false,
@@ -102,9 +103,9 @@ export default
                         add: {
                             ngClick: "addPermission",
                             label: 'Add',
-                            awToolTip: 'Add a permission',
+                            awToolTip: i18n._('Add a permission'),
                             actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '+ ADD',
+                            buttonContent: i18n._('+ ADD'),
                             ngShow: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
@@ -112,19 +113,19 @@ export default
                     fields: {
                         username: {
                             key: true,
-                            label: 'User',
+                            label: i18n._('User'),
                             linkBase: 'users',
                             class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
                         },
                         role: {
-                            label: 'Role',
+                            label: i18n._('Role'),
                             type: 'role',
                             noSort: true,
                             class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
                             noSearch: true
                         },
                         team_roles: {
-                            label: 'Team Roles',
+                            label: i18n._('Team Roles'),
                             type: 'team_roles',
                             noSort: true,
                             class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
@@ -143,7 +144,7 @@ export default
                 };
             }
 
-        })
+        };}])
         .factory('InventoryForm', ['InventoryFormObject', 'ScanJobsList',
         function(InventoryFormObject, ScanJobsList) {
             return function() {
diff --git a/awx/ui/client/src/forms/JobTemplates.js b/awx/ui/client/src/forms/JobTemplates.js
index 3ec35b2288..10d5119407 100644
--- a/awx/ui/client/src/forms/JobTemplates.js
+++ b/awx/ui/client/src/forms/JobTemplates.js
@@ -10,12 +10,14 @@
  * @description This form is for adding/editing a Job Template
 */
 
+
 export default
     angular.module('JobTemplateFormDefinition', [ 'CompletedJobsDefinition'])
 
-        .value ('JobTemplateFormObject', {
+        .factory('JobTemplateFormObject', ['i18n', function(i18n) {
+        return {
 
-            addTitle: 'New Job Template',
+            addTitle: i18n._('New Job Template'),
             editTitle: '{{ name }}',
             name: 'job_templates',
             base: 'job_templates',
@@ -23,7 +25,7 @@ export default
 
             fields: {
                 name: {
-                    label: 'Name',
+                    label: i18n._('Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -31,7 +33,7 @@ export default
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 description: {
-                    label: 'Description',
+                    label: i18n._('Description'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
@@ -39,7 +41,7 @@ export default
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 job_type: {
-                    label: 'Job Type',
+                    label: i18n._('Job Type'),
                     type: 'select',
                     ngOptions: 'type.label for type in job_type_options track by type.value',
                     ngChange: 'jobTypeChange()',
@@ -47,22 +49,22 @@ export default
                     addRequired: true,
                     editRequired: true,
                     column: 1,
-                    awPopOver: "
    When this template is submitted as a job, setting the type to run will execute the playbook, running tasks " +
+                    awPopOver: i18n._("
    When this template is submitted as a job, setting the type to run will execute the playbook, running tasks " +
                         " on the selected hosts.
    Setting the type to check will not execute the playbook. Instead, ansible will check playbook " +
                         " syntax, test environment setup and report problems.
    Setting the type to scan will execute the playbook and store any " +
-                        " scanned facts for use with Tower's System Tracking feature.
    ",
-                    dataTitle: 'Job Type',
+                        " scanned facts for use with Tower's System Tracking feature.
    "),
+                    dataTitle: i18n._('Job Type'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_job_type_on_launch',
                         ngShow: "!job_type.value || job_type.value !== 'scan'",
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 inventory: {
-                    label: 'Inventory',
+                    label: i18n._('Inventory'),
                     type: 'lookup',
                     sourceModel: 'inventory',
                     sourceField: 'name',
@@ -73,19 +75,19 @@ export default
                     },
                     requiredErrorMsg: "Please select an Inventory or check the Prompt on launch option.",
                     column: 1,
-                    awPopOver: "
    Select the inventory containing the hosts you want this job to manage.
    ",
-                    dataTitle: 'Inventory',
+                    awPopOver: i18n._("
    Select the inventory containing the hosts you want this job to manage.
    "),
+                    dataTitle: i18n._('Inventory'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_inventory_on_launch',
                         ngShow: "!job_type.value || job_type.value !== 'scan'",
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 project: {
-                    label: 'Project',
+                    label: i18n._('Project'),
                     labelAction: {
                         label: 'RESET',
                         ngClick: 'resetProjectToDefault()',
@@ -100,14 +102,14 @@ export default
                         init: "true"
                     },
                     column: 1,
-                    awPopOver: "
    Select the project containing the playbook you want this job to execute.
    ",
-                    dataTitle: 'Project',
+                    awPopOver: i18n._("
    Select the project containing the playbook you want this job to execute.
    "),
+                    dataTitle: i18n._('Project'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 playbook: {
-                    label: 'Playbook',
+                    label: i18n._('Playbook'),
                     type:'select',
                     ngOptions: 'book for book in playbook_options track by book',
                     ngDisabled: "(job_type.value === 'scan' && project_name === 'Default') || !(job_template_obj.summary_fields.user_capabilities.edit || canAdd)",
@@ -117,14 +119,14 @@ export default
                         init: "true"
                     },
                     column: 1,
-                    awPopOver: "
    Select the playbook to be executed by this job.
    ",
-                    dataTitle: 'Playbook',
+                    awPopOver: i18n._("
    Select the playbook to be executed by this job.
    "),
+                    dataTitle: i18n._('Playbook'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     includePlaybookNotFoundError: true
                 },
                 credential: {
-                    label: 'Machine Credential',
+                    label: i18n._('Machine Credential'),
                     type: 'lookup',
                     sourceModel: 'credential',
                     sourceField: 'name',
@@ -135,19 +137,19 @@ export default
                     },
                     requiredErrorMsg: "Please select a Machine Credential or check the Prompt on launch option.",
                     column: 1,
-                    awPopOver: "
    Select the credential you want the job to use when accessing the remote hosts. Choose the credential containing " +
-                     " the username and SSH key or password that Ansible will need to log into the remote hosts.
    ",
-                    dataTitle: 'Credential',
+                    awPopOver: i18n._("
    Select the credential you want the job to use when accessing the remote hosts. Choose the credential containing " +
+                     " the username and SSH key or password that Ansible will need to log into the remote hosts.
    "),
+                    dataTitle: i18n._('Credential'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_credential_on_launch',
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 cloud_credential: {
-                    label: 'Cloud Credential',
+                    label: i18n._('Cloud Credential'),
                     type: 'lookup',
                     sourceModel: 'cloud_credential',
                     sourceField: 'name',
@@ -155,15 +157,15 @@ export default
                     addRequired: false,
                     editRequired: false,
                     column: 1,
-                    awPopOver: "
    Selecting an optional cloud credential in the job template will pass along the access credentials to the " +
-                        "running playbook, allowing provisioning into the cloud without manually passing parameters to the included modules.
    ",
-                    dataTitle: 'Cloud Credential',
+                    awPopOver: i18n._("
    Selecting an optional cloud credential in the job template will pass along the access credentials to the " +
+                        "running playbook, allowing provisioning into the cloud without manually passing parameters to the included modules.
    "),
+                    dataTitle: i18n._('Cloud Credential'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 network_credential: {
-                    label: 'Network Credential',
+                    label: i18n._('Network Credential'),
                     type: 'lookup',
                     sourceModel: 'network_credential',
                     sourceField: 'name',
@@ -171,14 +173,14 @@ export default
                     addRequired: false,
                     editRequired: false,
                     column: 1,
-                    awPopOver: "
    Network credentials are used by Ansible networking modules to connect to and manage networking devices.
    ",
-                    dataTitle: 'Network Credential',
+                    awPopOver: i18n._("
    Network credentials are used by Ansible networking modules to connect to and manage networking devices.
    "),
+                    dataTitle: i18n._('Network Credential'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 forks: {
-                    label: 'Forks',
+                    label: i18n._('Forks'),
                     id: 'forks-number',
                     type: 'number',
                     integer: true,
@@ -189,121 +191,121 @@ export default
                     editRequired: false,
                     'class': "input-small",
                     column: 1,
-                    awPopOver: '
    The number of parallel or simultaneous processes to use while executing the playbook. 0 signifies ' +
+                    awPopOver: i18n._('
    The number of parallel or simultaneous processes to use while executing the playbook. 0 signifies ' +
                         'the default value from the ansible configuration file.
    ',
-                    dataTitle: 'Forks',
+                        ' target=\"_blank\">ansible configuration file.
    '),
+                    dataTitle: i18n._('Forks'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)' // TODO: get working
                 },
                 limit: {
-                    label: 'Limit',
+                    label: i18n._('Limit'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
                     column: 1,
-                    awPopOver: "
    Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. " +
+                    awPopOver: i18n._("
    Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. " +
                         "Multiple patterns can be separated by ; : or ,
    For more information and examples see " +
-                        "the Patterns topic at docs.ansible.com.
    ",
-                    dataTitle: 'Limit',
+                        "the Patterns topic at docs.ansible.com.
    "),
+                    dataTitle: i18n._('Limit'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_limit_on_launch',
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 verbosity: {
-                    label: 'Verbosity',
+                    label: i18n._('Verbosity'),
                     type: 'select',
                     ngOptions: 'v.label for v in verbosity_options track by v.value',
                     "default": 1,
                     addRequired: true,
                     editRequired: true,
                     column: 1,
-                    awPopOver: "
    Control the level of output ansible will produce as the playbook executes.
    ",
-                    dataTitle: 'Verbosity',
+                    awPopOver: i18n._("
    Control the level of output ansible will produce as the playbook executes.
    "),
+                    dataTitle: i18n._('Verbosity'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 job_tags: {
-                    label: 'Job Tags',
+                    label: i18n._('Job Tags'),
                     type: 'textarea',
                     rows: 5,
                     addRequired: false,
                     editRequired: false,
                     'elementClass': 'Form-textInput',
                     column: 2,
-                    awPopOver: "
    Provide a comma separated list of tags.
    \n" +
+                    awPopOver: i18n._("
    Provide a comma separated list of tags.
    \n" +
                         "
    Tags are useful when you have a large playbook, and you want to run a specific part of a play or task.
    " +
-                        "
    Consult the Ansible documentation for further details on the usage of tags.
    ",
-                    dataTitle: "Job Tags",
+                        "
    Consult the Ansible documentation for further details on the usage of tags.
    "),
+                    dataTitle: i18n._("Job Tags"),
                     dataPlacement: "right",
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_tags_on_launch',
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 skip_tags: {
-                    label: 'Skip Tags',
+                    label: i18n._('Skip Tags'),
                     type: 'textarea',
                     rows: 5,
                     addRequired: false,
                     editRequired: false,
                     'elementClass': 'Form-textInput',
                     column: 2,
-                    awPopOver: "
    Provide a comma separated list of tags.
    \n" +
+                    awPopOver: i18n._("
    Provide a comma separated list of tags.
    \n" +
                         "
    Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task.
    " +
-                        "
    Consult the Ansible documentation for further details on the usage of tags.
    ",
-                    dataTitle: "Skip Tags",
+                        "
    Consult the Ansible documentation for further details on the usage of tags.
    "),
+                    dataTitle: i18n._("Skip Tags"),
                     dataPlacement: "right",
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_skip_tags_on_launch',
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 checkbox_group: {
-                    label: 'Options',
+                    label: i18n._('Options'),
                     type: 'checkbox_group',
                     fields: [{
                         name: 'become_enabled',
-                        label: 'Enable Privilege Escalation',
+                        label: i18n._('Enable Privilege Escalation'),
                         type: 'checkbox',
                         addRequired: false,
                         editRequird: false,
                         column: 2,
-                        awPopOver: "
    If enabled, run this playbook as an administrator. This is the equivalent of passing the --become option to the ansible-playbook command. 
    ",
+                        awPopOver: i18n._("
    If enabled, run this playbook as an administrator. This is the equivalent of passing the --become option to the ansible-playbook command. 
    "),
                         dataPlacement: 'right',
-                        dataTitle: 'Become Privilege Escalation',
+                        dataTitle: i18n._('Become Privilege Escalation'),
                         dataContainer: "body",
                         labelClass: 'stack-inline',
                         ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                     }, {
                         name: 'allow_callbacks',
-                        label: 'Allow Provisioning Callbacks',
+                        label: i18n._('Allow Provisioning Callbacks'),
                         type: 'checkbox',
                         addRequired: false,
                         editRequird: false,
                         ngChange: "toggleCallback('host_config_key')",
                         column: 2,
-                        awPopOver: "
    Enables creation of a provisioning callback URL. Using the URL a host can contact Tower and request a configuration update " +
-                            "using this job template.
    ",
+                        awPopOver: i18n._("
    Enables creation of a provisioning callback URL. Using the URL a host can contact Tower and request a configuration update " +
+                            "using this job template.
    "),
                         dataPlacement: 'right',
-                        dataTitle: 'Allow Provisioning Callbacks',
+                        dataTitle: i18n._('Allow Provisioning Callbacks'),
                         dataContainer: "body",
                         labelClass: 'stack-inline',
                         ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                     }]
                 },
                 callback_url: {
-                    label: 'Provisioning Callback URL',
+                    label: i18n._('Provisioning Callback URL'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
@@ -313,12 +315,12 @@ export default
                     awPopOver: "callback_help",
                     awPopOverWatch: "callback_help",
                     dataPlacement: 'top',
-                    dataTitle: 'Provisioning Callback URL',
+                    dataTitle: i18n._('Provisioning Callback URL'),
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 host_config_key: {
-                    label: 'Host Config Key',
+                    label: i18n._('Host Config Key'),
                     type: 'text',
                     ngShow: "allow_callbacks  && allow_callbacks !== 'false'",
                     ngChange: "configKeyChange()",
@@ -327,26 +329,26 @@ export default
                     awPopOver: "callback_help",
                     awPopOverWatch: "callback_help",
                     dataPlacement: 'right',
-                    dataTitle: "Host Config Key",
+                    dataTitle: i18n._("Host Config Key"),
                     dataContainer: "body",
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 labels: {
-                    label: 'Labels',
+                    label: i18n._('Labels'),
                     type: 'select',
                     class: 'Form-formGroup--fullWidth',
                     ngOptions: 'label.label for label in labelOptions track by label.value',
                     multiSelect: true,
                     addRequired: false,
                     editRequired: false,
-                    dataTitle: 'Labels',
+                    dataTitle: i18n._('Labels'),
                     dataPlacement: 'right',
-                    awPopOver: "
    Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.
    ",
+                    awPopOver: i18n._("
    Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.
    "),
                     dataContainer: 'body',
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 variables: {
-                    label: 'Extra Variables',
+                    label: i18n._('Extra Variables'),
                     type: 'textarea',
                     class: 'Form-textAreaLabel Form-formGroup--fullWidth',
                     rows: 6,
@@ -354,18 +356,18 @@ export default
                     editRequired: false,
                     "default": "---",
                     column: 2,
-                    awPopOver: "
    Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " +
+                    awPopOver: i18n._("
    Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " +
                         "for ansible-playbook. Provide key/value pairs using either YAML or JSON.
    " +
                         "JSON:
    \n" +
                         "
    {
     \"somevar\": \"somevalue\",
     \"password\": \"magic\"
     }
    \n" +
                         "YAML:
    \n" +
-                        "
    ---
    somevar: somevalue
    password: magic
    \n",
-                    dataTitle: 'Extra Variables',
+                        "
    ---
    somevar: somevalue
    password: magic
    \n"),
+                    dataTitle: i18n._('Extra Variables'),
                     dataPlacement: 'right',
                     dataContainer: "body",
                     subCheckbox: {
                         variable: 'ask_variables_on_launch',
-                        text: 'Prompt on launch'
+                        text: i18n._('Prompt on launch')
                     },
                     ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)' // TODO: get working
                 }
@@ -409,11 +411,11 @@ export default
                     include: "CompletedJobsList"
                 },
                 permissions: {
-                    awToolTip: 'Please save before assigning permissions',
+                    awToolTip: i18n._('Please save before assigning permissions'),
                     dataPlacement: 'top',
                     basePath: 'job_templates/:id/access_list/',
                     type: 'collection',
-                    title: 'Permissions',
+                    title: i18n._('Permissions'),
                     iterator: 'permission',
                     index: false,
                     open: false,
@@ -473,7 +475,7 @@ export default
                     }
                 };
             }
-        })
+        };}])
 
         .factory('JobTemplateForm', ['JobTemplateFormObject', 'NotificationsList', 'CompletedJobsList',
         function(JobTemplateFormObject, NotificationsList, CompletedJobsList) {
diff --git a/awx/ui/client/src/forms/Organizations.js b/awx/ui/client/src/forms/Organizations.js
index 377d5a911e..d5607f26d9 100644
--- a/awx/ui/client/src/forms/Organizations.js
+++ b/awx/ui/client/src/forms/Organizations.js
@@ -12,16 +12,17 @@
 
 export default
     angular.module('OrganizationFormDefinition', [])
-        .value('OrganizationFormObject', {
+        .factory('OrganizationFormObject', ['i18n', function(i18n) {
+        return {
 
-            addTitle: 'New Organization', //Title in add mode
+            addTitle: i18n._('New Organization'), //Title in add mode
             editTitle: '{{ name }}', //Title in edit mode
             name: 'organization', //entity or model name in singular form
             tabs: true,
 
             fields: {
                 name: {
-                    label: 'Name',
+                    label: i18n._('Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -29,7 +30,7 @@ export default
                     ngDisabled: '!(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 description: {
-                    label: 'Description',
+                    label: i18n._('Description'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
@@ -56,10 +57,10 @@ export default
             related: {
                 permissions: {
                     basePath: 'organizations/:id/access_list/',
-                    awToolTip: 'Please save before assigning permissions',
+                    awToolTip: i18n._('Please save before assigning permissions'),
                     dataPlacement: 'top',
                     type: 'collection',
-                    title: 'Permissions',
+                    title: i18n._('Permissions'),
                     iterator: 'permission',
                     index: false,
                     open: false,
@@ -68,9 +69,9 @@ export default
                         add: {
                             ngClick: "addPermission",
                             label: 'Add',
-                            awToolTip: 'Add a permission',
+                            awToolTip: i18n._('Add a permission'),
                             actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '+ ADD',
+                            buttonContent: i18n._('+ ADD'),
                             ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
@@ -78,19 +79,19 @@ export default
                     fields: {
                         username: {
                             key: true,
-                            label: 'User',
+                            label: i18n._('User'),
                             linkBase: 'users',
                             class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
                         },
                         role: {
-                            label: 'Role',
+                            label: i18n._('Role'),
                             type: 'role',
                             noSort: true,
                             class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
                             searchable: false
                         },
                         team_roles: {
-                            label: 'Team Roles',
+                            label: i18n._('Team Roles'),
                             type: 'team_roles',
                             noSort: true,
                             class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4',
@@ -116,7 +117,7 @@ export default
                     }
                 };
             }
-        })
+        };}])
 
         .factory('OrganizationForm', ['OrganizationFormObject', 'NotificationsList',
             function(OrganizationFormObject, NotificationsList) {
diff --git a/awx/ui/client/src/forms/Projects.js b/awx/ui/client/src/forms/Projects.js
index 409386b348..309b55a84f 100644
--- a/awx/ui/client/src/forms/Projects.js
+++ b/awx/ui/client/src/forms/Projects.js
@@ -12,21 +12,22 @@
 
 export default
 angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
-    .value('ProjectsFormObject', {
+    .factory('ProjectsFormObject', ['i18n', function(i18n) {
+    return {
 
-        addTitle: 'New Project',
+        addTitle: i18n._('New Project'),
         editTitle: '{{ name }}',
         name: 'project',
         forceListeners: true,
         tabs: true,
         subFormTitles: {
-            sourceSubForm: 'Source Details',
+            sourceSubForm: i18n._('Source Details'),
         },
 
 
         fields: {
             name: {
-                label: 'Name',
+                label: i18n._('Name'),
                 type: 'text',
                 addRequired: true,
                 editRequired: true,
@@ -34,14 +35,14 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 type: 'text',
                 addRequired: false,
                 editRequired: false,
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             organization: {
-                label: 'Organization',
+                label: i18n._('Organization'),
                 type: 'lookup',
                 sourceModel: 'organization',
                 sourceField: 'name',
@@ -50,13 +51,13 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                     reqExpression: "organizationrequired",
                     init: "true"
                 },
-                dataTitle: 'Organization',
+                dataTitle: i18n._('Organization'),
                 dataContainer: 'body',
                 dataPlacement: 'right',
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             scm_type: {
-                label: 'SCM Type',
+                label: i18n._('SCM Type'),
                 type: 'select',
                 class: 'Form-dropDown--scmType',
                 ngOptions: 'type.label for type in scm_type_options track by type.value',
@@ -76,21 +77,21 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 closeable: false
             },
             base_dir: {
-                label: 'Project Base Path',
+                label: i18n._('Project Base Path'),
                 type: 'text',
                 class: 'Form-textUneditable',
                 showonly: true,
                 ngShow: "scm_type.value == 'manual' " ,
-                awPopOver: '
    Base path used for locating playbooks. Directories found inside this path will be listed in the playbook directory drop-down. ' +
+                awPopOver: i18n._('
    Base path used for locating playbooks. Directories found inside this path will be listed in the playbook directory drop-down. ' +
                     'Together the base path and selected playbook directory provide the full path used to locate playbooks.
    ' +
-                    '
    Use PROJECTS_ROOT in your environment settings file to determine the base path value.
    ',
-                dataTitle: 'Project Base Path',
+                    '
    Use PROJECTS_ROOT in your environment settings file to determine the base path value.
    '),
+                dataTitle: i18n._('Project Base Path'),
                 dataContainer: 'body',
                 dataPlacement: 'right',
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             local_path: {
-                label: 'Playbook Directory',
+                label: i18n._('Playbook Directory'),
                 type: 'select',
                 id: 'local-path-select',
                 ngOptions: 'path.label for path in project_local_paths',
@@ -99,10 +100,10 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                     init: false
                 },
                 ngShow: "scm_type.value == 'manual' && !showMissingPlaybooksAlert",
-                awPopOver: '
    Select from the list of directories found in the base path.' +
+                awPopOver: i18n._('
    Select from the list of directories found in the base path.' +
                     'Together the base path and the playbook directory provide the full path used to locate playbooks.
    ' +
-                    '
    Use PROJECTS_ROOT in your environment settings file to determine the base path value.
    ',
-                dataTitle: 'Project Path',
+                    '
    Use PROJECTS_ROOT in your environment settings file to determine the base path value.
    '),
+                dataTitle: i18n._('Project Path'),
                 dataContainer: 'body',
                 dataPlacement: 'right',
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
@@ -134,7 +135,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             credential: {
-                label: 'SCM Credential',
+                label: i18n._('SCM Credential'),
                 type: 'lookup',
                 ngShow: "scm_type && scm_type.value !== 'manual'",
                 sourceModel: 'credential',
@@ -146,43 +147,43 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             checkbox_group: {
-                label: 'SCM Update Options',
+                label: i18n._('SCM Update Options'),
                 type: 'checkbox_group',
                 ngShow: "scm_type && scm_type.value !== 'manual'",
                 subForm: 'sourceSubForm',
                 fields: [{
                     name: 'scm_clean',
-                    label: 'Clean',
+                    label: i18n._('Clean'),
                     type: 'checkbox',
                     addRequired: false,
                     editRequired: false,
-                    awPopOver: '
    Remove any local modifications prior to performing an update.
    ',
-                    dataTitle: 'SCM Clean',
+                    awPopOver: i18n._('
    Remove any local modifications prior to performing an update.
    '),
+                    dataTitle: i18n._('SCM Clean'),
                     dataContainer: 'body',
                     dataPlacement: 'right',
                     labelClass: 'checkbox-options stack-inline',
                     ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
                 }, {
                     name: 'scm_delete_on_update',
-                    label: 'Delete on Update',
+                    label: i18n._('Delete on Update'),
                     type: 'checkbox',
                     addRequired: false,
                     editRequired: false,
-                    awPopOver: '
    Delete the local repository in its entirety prior to performing an update.
    Depending on the size of the ' +
-                        'repository this may significantly increase the amount of time required to complete an update.
    ',
-                    dataTitle: 'SCM Delete',
+                    awPopOver: i18n._('
    Delete the local repository in its entirety prior to performing an update.
    Depending on the size of the ' +
+                        'repository this may significantly increase the amount of time required to complete an update.
    '),
+                    dataTitle: i18n._('SCM Delete'),
                     dataContainer: 'body',
                     dataPlacement: 'right',
                     labelClass: 'checkbox-options stack-inline',
                     ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)'
                 }, {
                     name: 'scm_update_on_launch',
-                    label: 'Update on Launch',
+                    label: i18n._('Update on Launch'),
                     type: 'checkbox',
                     addRequired: false,
                     editRequired: false,
-                    awPopOver: '
    Each time a job runs using this project, perform an update to the local repository prior to starting the job.
    ',
-                    dataTitle: 'SCM Update',
+                    awPopOver: i18n._('
    Each time a job runs using this project, perform an update to the local repository prior to starting the job.
    '),
+                    dataTitle: i18n._('SCM Update'),
                     dataContainer: 'body',
                     dataPlacement: 'right',
                     labelClass: 'checkbox-options stack-inline',
@@ -190,7 +191,7 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 }]
             },
             scm_update_cache_timeout: {
-                label: 'Cache Timeout (seconds)',
+                label: i18n._('Cache Timeout (seconds)'),
                 id: 'scm-cache-timeout',
                 type: 'number',
                 integer: true,
@@ -200,10 +201,10 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                 "default": '0',
                 addRequired: false,
                 editRequired: false,
-                awPopOver: '
    Time in seconds to consider a project to be current. During job runs and callbacks the task system will ' +
+                awPopOver: i18n._('
    Time in seconds to consider a project to be current. During job runs and callbacks the task system will ' +
                     'evaluate the timestamp of the latest project update. If it is older than Cache Timeout, it is not considered current, ' +
-                    'and a new project update will be performed.
    ',
-                dataTitle: 'Cache Timeout',
+                    'and a new project update will be performed.
    '),
+                dataTitle: i18n._('Cache Timeout'),
                 dataPlacement: 'right',
                 dataContainer: "body",
                 ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)' // TODO: get working
@@ -228,11 +229,11 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
 
         related: {
             permissions: {
-                awToolTip: 'Please save before assigning permissions',
+                awToolTip: i18n._('Please save before assigning permissions'),
                 dataPlacement: 'top',
                 basePath: 'projects/:id/access_list/',
                 type: 'collection',
-                title: 'Permissions',
+                title: i18n._('Permissions'),
                 iterator: 'permission',
                 index: false,
                 open: false,
@@ -241,9 +242,9 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
                     add: {
                         ngClick: "addPermission",
                         label: 'Add',
-                        awToolTip: 'Add a permission',
+                        awToolTip: i18n._('Add a permission'),
                         actionClass: 'btn List-buttonSubmit',
-                        buttonContent: '+ ADD',
+                        buttonContent: i18n._('+ ADD'),
                         ngShow: '(project_obj.summary_fields.user_capabilities.edit || canAdd)'
                     }
                 },
@@ -289,9 +290,10 @@ angular.module('ProjectFormDefinition', ['SchedulesListDefinition'])
             };
         }
 
-    })
+    };}])
 
-    .factory('ProjectsForm', ['ProjectsFormObject', 'NotificationsList', function(ProjectsFormObject, NotificationsList) {
+    .factory('ProjectsForm', ['ProjectsFormObject', 'NotificationsList',
+    function(ProjectsFormObject, NotificationsList) {
         return function() {
             var itm;
             for (itm in ProjectsFormObject.related) {
diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js
index 6023650156..0d4991e59c 100644
--- a/awx/ui/client/src/forms/Teams.js
+++ b/awx/ui/client/src/forms/Teams.js
@@ -12,16 +12,17 @@
 
 export default
     angular.module('TeamFormDefinition', [])
-        .value('TeamForm', {
+        .factory('TeamForm', ['i18n', function(i18n) {
+        return {
 
-            addTitle: 'New Team', //Legend in add mode
+            addTitle: i18n._('New Team'), //Legend in add mode
             editTitle: '{{ name }}', //Legend in edit mode
             name: 'team',
             tabs: true,
 
             fields: {
                 name: {
-                    label: 'Name',
+                    label: i18n._('Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -29,14 +30,14 @@ export default
                     ngDisabled: '!(team_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 description: {
-                    label: 'Description',
+                    label: i18n._('Description'),
                     type: 'text',
                     addRequired: false,
                     editRequired: false,
                     ngDisabled: '!(team_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 organization: {
-                    label: 'Organization',
+                    label: i18n._('Organization'),
                     type: 'lookup',
                     sourceModel: 'organization',
                     sourceField: 'name',
@@ -70,10 +71,10 @@ export default
             related: {
                 access_list: {
                     dataPlacement: 'top',
-                    awToolTip: 'Please save before adding users',
+                    awToolTip: i18n._('Please save before adding users'),
                     basePath: 'teams/:id/access_list/',
                     type: 'collection',
-                    title: 'Users',
+                    title: i18n._('Users'),
                     iterator: 'permission',
                     index: false,
                     open: false,
@@ -82,9 +83,9 @@ export default
                         add: {
                             ngClick: "addPermissionWithoutTeamTab",
                             label: 'Add',
-                            awToolTip: 'Add user to team',
+                            awToolTip: i18n._('Add user to team'),
                             actionClass: 'btn List-buttonSubmit',
-                            buttonContent: '+ ADD',
+                            buttonContent: i18n._('+ ADD'),
                             ngShow: '(team_obj.summary_fields.user_capabilities.edit || canAdd)'
                         }
                     },
@@ -92,12 +93,12 @@ export default
                     fields: {
                         username: {
                             key: true,
-                            label: 'User',
+                            label: i18n._('User'),
                             linkBase: 'users',
                             class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
                         },
                         role: {
-                            label: 'Role',
+                            label: i18n._('Role'),
                             type: 'role',
                             noSort: true,
                             class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4',
@@ -108,40 +109,40 @@ export default
                 roles: {
                     hideSearchAndActions: true,
                     dataPlacement: 'top',
-                    awToolTip: 'Please save before assigning permissions',
+                    awToolTip: i18n._('Please save before assigning permissions'),
                     basePath: 'teams/:id/roles/',
                     type: 'collection',
-                    title: 'Granted Permissions',
+                    title: i18n._('Granted Permissions'),
                     iterator: 'role',
                     open: false,
                     index: false,
                     actions: {},
-                    emptyListText: 'No permissions have been granted',
+                    emptyListText: i18n._('No permissions have been granted'),
                     fields: {
                         name: {
-                            label: 'Name',
+                            label: i18n._('Name'),
                             ngBind: 'role.summary_fields.resource_name',
                             linkTo: '{{convertApiUrl(role.related[role.summary_fields.resource_type])}}',
                             noSort: true
                         },
                         type: {
-                            label: 'Type',
+                            label: i18n._('Type'),
                             ngBind: 'role.summary_fields.resource_type_display_name',
                             noSort: true
                         },
                         role: {
-                            label: 'Role',
+                            label: i18n._('Role'),
                             ngBind: 'role.name',
                             noSort: true
                         }
                     },
                     fieldActions: {
                         "delete": {
-                            label: 'Remove',
+                            label: i18n._('Remove'),
                             ngClick: 'deletePermissionFromTeam(team_id, team_obj.name, role.name, role.summary_fields.resource_name, role.related.teams)',
                             'class': "List-actionButton--delete",
                             iconClass: 'fa fa-times',
-                            awToolTip: 'Dissasociate permission from team',
+                            awToolTip: i18n._('Dissasociate permission from team'),
                             dataPlacement: 'top',
                             ngShow: 'permission.summary_fields.user_capabilities.unattach'
                         }
@@ -149,4 +150,4 @@ export default
                     hideOnSuperuser: true
                 }
             },
-        }); //InventoryForm
+        };}]); //InventoryForm
diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js
index a93e549cae..73d5307471 100644
--- a/awx/ui/client/src/forms/Users.js
+++ b/awx/ui/client/src/forms/Users.js
@@ -12,9 +12,10 @@
 
 export default
     angular.module('UserFormDefinition', [])
-        .value('UserForm', {
+        .factory('UserForm', ['i18n', function(i18n) {
+        return {
 
-            addTitle: 'New User',
+            addTitle: i18n._('New User'),
             editTitle: '{{ username }}',
             name: 'user',
             forceListeners: true,
@@ -22,7 +23,7 @@ export default
 
             fields: {
                 first_name: {
-                    label: 'First Name',
+                    label: i18n._('First Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -30,7 +31,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 last_name: {
-                    label: 'Last Name',
+                    label: i18n._('Last Name'),
                     type: 'text',
                     addRequired: true,
                     editRequired: true,
@@ -38,7 +39,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 email: {
-                    label: 'Email',
+                    label: i18n._('Email'),
                     type: 'email',
                     addRequired: true,
                     editRequired: true,
@@ -46,7 +47,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 username: {
-                    label: 'Username',
+                    label: i18n._('Username'),
                     type: 'text',
                     awRequiredWhen: {
                         reqExpression: "not_ldap_user && external_account === null",
@@ -56,7 +57,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 organization: {
-                    label: 'Organization',
+                    label: i18n._('Organization'),
                     type: 'lookup',
                     sourceModel: 'organization',
                     sourceField: 'name',
@@ -71,7 +72,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 password: {
-                    label: 'Password',
+                    label: i18n._('Password'),
                     type: 'sensitive',
                     hasShowInputButton: true,
                     ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
@@ -83,7 +84,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 password_confirm: {
-                    label: 'Confirm Password',
+                    label: i18n._('Confirm Password'),
                     type: 'sensitive',
                     hasShowInputButton: true,
                     ngShow: 'ldap_user == false && socialAuthUser === false && external_account === null',
@@ -95,7 +96,7 @@ export default
                     ngDisabled: '!(user_obj.summary_fields.user_capabilities.edit || canAdd)'
                 },
                 user_type: {
-                    label: 'User Type',
+                    label: i18n._('User Type'),
                     type: 'select',
                     ngOptions: 'item as item.label for item in user_type_options track by item.type',
                     disableChooseOption: true,
@@ -124,10 +125,10 @@ export default
             related: {
                 organizations: {
                     basePath: 'users/:id/organizations',
-                    awToolTip: 'Please save before assigning to organizations',
+                    awToolTip: i18n._('Please save before assigning to organizations'),
                     dataPlacement: 'top',
                     type: 'collection',
-                    title: 'Organizations',
+                    title: i18n._('Organizations'),
                     iterator: 'organization',
                     index: false,
                     open: false,
@@ -147,10 +148,10 @@ export default
                 },
                 teams: {
                     basePath: 'users/:id/teams',
-                    awToolTip: 'Please save before assigning to teams',
+                    awToolTip: i18n._('Please save before assigning to teams'),
                     dataPlacement: 'top',
                     type: 'collection',
-                    title: 'Teams',
+                    title: i18n._('Teams'),
                     iterator: 'team',
                     open: false,
                     index: false,
@@ -168,39 +169,39 @@ export default
                     hideOnSuperuser: true
                 },
                 roles: {
-                    awToolTip: 'Please save before assigning to organizations',
+                    awToolTip: i18n._('Please save before assigning to organizations'),
                     dataPlacement: 'top',
                     hideSearchAndActions: true,
                     type: 'collection',
-                    title: 'Granted permissions',
+                    title: i18n._('Granted permissions'),
                     iterator: 'permission',
                     open: false,
                     index: false,
-                    emptyListText: 'No permissions have been granted',
+                    emptyListText: i18n._('No permissions have been granted'),
                     fields: {
                         name: {
-                            label: 'Name',
+                            label: i18n._('Name'),
                             ngBind: 'permission.summary_fields.resource_name',
                             linkTo: '{{convertApiUrl(permission.related[permission.summary_fields.resource_type])}}',
                             noSort: true
                         },
                         type: {
-                            label: 'Type',
+                            label: i18n._('Type'),
                             ngBind: 'permission.summary_fields.resource_type_display_name',
                             noSort: true
                         },
                         role: {
-                            label: 'Role',
+                            label: i18n._('Role'),
                             ngBind: 'permission.name',
                             noSort: true
                         },
                     },
                     fieldActions: {
                         "delete": {
-                            label: 'Remove',
+                            label: i18n._('Remove'),
                             ngClick: 'deletePermissionFromUser(user_id, username, permission.name, permission.summary_fields.resource_name, permission.related.users)',
                             iconClass: 'fa fa-times',
-                            awToolTip: 'Dissasociate permission from user',
+                            awToolTip: i18n._('Dissasociate permission from user'),
                             ngShow: 'permission.summary_fields.user_capabilities.unattach'
                         }
                     },
@@ -208,4 +209,4 @@ export default
                 }
             }
 
-        });
+        };}]);
diff --git a/awx/ui/client/src/helpers/Credentials.js b/awx/ui/client/src/helpers/Credentials.js
index 0a81b3eee9..bf239a6595 100644
--- a/awx/ui/client/src/helpers/Credentials.js
+++ b/awx/ui/client/src/helpers/Credentials.js
@@ -13,8 +13,8 @@
 export default
 angular.module('CredentialsHelper', ['Utilities'])
 
-.factory('KindChange', ['Empty',
-         function (Empty) {
+.factory('KindChange', ['Empty', 'i18n',
+         function (Empty, i18n) {
              return function (params) {
                  var scope = params.scope,
                  reset = params.reset,
@@ -29,20 +29,20 @@ angular.module('CredentialsHelper', ['Utilities'])
                      $(this).hide();
                  });
                  // Put things in a default state
-                 scope.usernameLabel = 'Username';
+                 scope.usernameLabel = i18n._('Username');
                  scope.aws_required = false;
                  scope.email_required = false;
                  scope.rackspace_required = false;
-                 scope.sshKeyDataLabel = 'Private Key';
+                 scope.sshKeyDataLabel = i18n._('Private Key');
                  scope.username_required = false;                        // JT-- added username_required b/c mutliple 'kinds' need username to be required (GCE)
                  scope.key_required = false;                             // JT -- doing the same for key and project
                  scope.project_required = false;
                  scope.subscription_required = false;
-                 scope.key_description = "Paste the contents of the SSH private key file.
    esc or click to close
    ";
+                 scope.key_description = i18n._("Paste the contents of the SSH private key file.
    esc or click to close
    ");
                  scope.host_required = false;
                  scope.password_required = false;
                  scope.hostLabel = '';
-                 scope.passwordLabel = 'Password';
+                 scope.passwordLabel = i18n._('Password');
 
                  $('.popover').each(function() {
                      // remove lingering popover 
    . Seems to be a bug in TB3 RC1
@@ -53,26 +53,26 @@ angular.module('CredentialsHelper', ['Utilities'])
                      $(this).hide();
                  });
                  // Put things in a default state
-                 scope.usernameLabel = 'Username';
+                 scope.usernameLabel = i18n._('Username');
                  scope.aws_required = false;
                  scope.email_required = false;
                  scope.rackspace_required = false;
-                 scope.sshKeyDataLabel = 'Private Key';
+                 scope.sshKeyDataLabel = i18n._('Private Key');
                  scope.username_required = false;                        // JT-- added username_required b/c mutliple 'kinds' need username to be required (GCE)
                  scope.key_required = false;                             // JT -- doing the same for key and project
                  scope.project_required = false;
                  scope.domain_required = false;
                  scope.subscription_required = false;
-                 scope.key_description = "Paste the contents of the SSH private key file.";
+                 scope.key_description = i18n._("Paste the contents of the SSH private key file.");
                  scope.host_required = false;
                  scope.password_required = false;
                  scope.hostLabel = '';
                  scope.projectLabel = '';
                  scope.domainLabel = '';
                  scope.project_required = false;
-                 scope.passwordLabel = 'Password (API Key)';
-                 scope.projectPopOver = "
    The project value
    ";
-                 scope.hostPopOver = "
    The host value
    ";
+                 scope.passwordLabel = i18n._('Password (API Key)');
+                 scope.projectPopOver = i18n._("
    The project value
    ");
+                 scope.hostPopOver = i18n._("
    The host value
    ");
                  scope.ssh_key_data_api_error = '';
                  if (!Empty(scope.kind)) {
                      // Apply kind specific settings
@@ -85,38 +85,38 @@ angular.module('CredentialsHelper', ['Utilities'])
                              scope.username_required = true;
                          break;
                          case 'ssh':
-                             scope.usernameLabel = 'Username'; //formally 'SSH Username'
-                             scope.becomeUsernameLabel = 'Privilege Escalation Username';
-                             scope.becomePasswordLabel = 'Privilege Escalation Password';
+                             scope.usernameLabel = i18n._('Username'); //formally 'SSH Username'
+                             scope.becomeUsernameLabel = i18n._('Privilege Escalation Username');
+                             scope.becomePasswordLabel = i18n._('Privilege Escalation Password');
                          break;
                          case 'scm':
-                             scope.sshKeyDataLabel = 'SCM Private Key';
-                             scope.passwordLabel = 'Password';
+                             scope.sshKeyDataLabel = i18n._('SCM Private Key');
+                             scope.passwordLabel = i18n._('Password');
                          break;
                          case 'gce':
-                             scope.usernameLabel = 'Service Account Email Address';
-                             scope.sshKeyDataLabel = 'RSA Private Key';
+                             scope.usernameLabel = i18n._('Service Account Email Address');
+                             scope.sshKeyDataLabel = i18n._('RSA Private Key');
                              scope.email_required = true;
                              scope.key_required = true;
                              scope.project_required = true;
-                             scope.key_description =  'Paste the contents of the PEM file associated with the service account email.';
-                             scope.projectLabel = "Project";
+                             scope.key_description =  i18n._('Paste the contents of the PEM file associated with the service account email.');
+                             scope.projectLabel = i18n._("Project");
                              scope.project_required = false;
-                             scope.projectPopOver = "
    The Project ID is the " +
+                             scope.projectPopOver = i18n._("
    The Project ID is the " +
                              "GCE assigned identification. It is constructed as " +
                              "two words followed by a three digit number.  Such " +
-                             "as: 
    adjective-noun-000
    ";
+                             "as: 
    adjective-noun-000
    ");
                          break;
                          case 'azure':
-                             scope.sshKeyDataLabel = 'Management Certificate';
+                             scope.sshKeyDataLabel = i18n._('Management Certificate');
                              scope.subscription_required = true;
                              scope.key_required = true;
-                             scope.key_description = "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.";
+                             scope.key_description = i18n._("Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console.");
                          break;
                          case 'azure_rm':
-                             scope.usernameLabel = "Username";
+                             scope.usernameLabel = i18n._("Username");
                              scope.subscription_required = true;
-                             scope.passwordLabel = 'Password';
+                             scope.passwordLabel = i18n._('Password');
                              scope.azure_rm_required = true;
                          break;
                          case 'vmware':
@@ -124,46 +124,46 @@ angular.module('CredentialsHelper', ['Utilities'])
                              scope.host_required = true;
                              scope.password_required = true;
                              scope.hostLabel = "vCenter Host";
-                             scope.passwordLabel = 'Password';
-                             scope.hostPopOver = "Enter the hostname or IP address which corresponds to your VMware vCenter.";
+                             scope.passwordLabel = i18n._('Password');
+                             scope.hostPopOver = i18n._("Enter the hostname or IP address which corresponds to your VMware vCenter.");
                          break;
                          case 'openstack':
-                             scope.hostLabel = "Host (Authentication URL)";
-                             scope.projectLabel = "Project (Tenant Name)";
-                             scope.domainLabel = "Domain Name";
+                             scope.hostLabel = i18n._("Host (Authentication URL)");
+                             scope.projectLabel = i18n._("Project (Tenant Name)");
+                             scope.domainLabel = i18n._("Domain Name");
                              scope.password_required = true;
                              scope.project_required = true;
                              scope.host_required = true;
                              scope.username_required = true;
-                             scope.projectPopOver = "
    This is the tenant name. " +
+                             scope.projectPopOver = i18n._("
    This is the tenant name. " +
                                  " This value is usually the same " +
-                                 " as the username.
    ";
-                             scope.hostPopOver = "
    The host to authenticate with." +
-                                 "
    For example, https://openstack.business.com/v2.0/";
+                                 " as the username.
    ");
+                             scope.hostPopOver = i18n._("
    The host to authenticate with." +
+                                 "
    For example, https://openstack.business.com/v2.0/");
                          break;
                          case 'satellite6':
                             scope.username_required = true;
                             scope.password_required = true;
-                            scope.passwordLabel = 'Password';
+                            scope.passwordLabel = i18n._('Password');
                             scope.host_required = true;
-                            scope.hostLabel = "Satellite 6 Host";
-                            scope.hostPopOver = "Enter the hostname or IP address name which 
    " +
-                                "corresponds to your Red Hat Satellite 6 server.";
+                            scope.hostLabel = i18n._("Satellite 6 Host");
+                            scope.hostPopOver = i18n._("Enter the hostname or IP address name which 
    " +
+                                "corresponds to your Red Hat Satellite 6 server.");
                          break;
                          case 'cloudforms':
                             scope.username_required = true;
                             scope.password_required = true;
-                            scope.passwordLabel = 'Password';
+                            scope.passwordLabel = i18n._('Password');
                             scope.host_required = true;
-                            scope.hostLabel = "CloudForms Host";
-                            scope.hostPopOver = "Enter the hostname or IP address for the virtual 
    " +
-                                " machine which is hosting the CloudForm appliance.";
+                            scope.hostLabel = i18n._("CloudForms Host");
+                            scope.hostPopOver = i18n._("Enter the hostname or IP address for the virtual 
    " +
+                                " machine which is hosting the CloudForm appliance.");
                          break;
                          case 'net':
                             scope.username_required = true;
                             scope.password_required = false;
-                            scope.passwordLabel = 'Password';
-                            scope.sshKeyDataLabel = 'SSH Key';
+                            scope.passwordLabel = i18n._('Password');
+                            scope.sshKeyDataLabel = i18n._('SSH Key');
                          break;
                      }
                  }
diff --git a/awx/ui/client/src/i18n.js b/awx/ui/client/src/i18n.js
new file mode 100644
index 0000000000..7a353583e6
--- /dev/null
+++ b/awx/ui/client/src/i18n.js
@@ -0,0 +1,97 @@
+function isString(arg) {
+    return typeof arg === 'string';
+}
+
+function isNull(arg) {
+    return arg === null;
+}
+
+function isObject(arg) {
+    return typeof arg === 'object' && arg !== null;
+}
+
+/**
+ * @ngdoc method
+ * @name function:i18n#N_
+ * @methodOf function:N_
+ * @description this function marks the translatable string with N_
+ *  for 'grunt nggettext_extract'
+ *
+*/
+export function N_(s) {
+    return s;
+}
+
+// Copied format() from util/util.js. util.js includes "require()".
+/**
+ * @ngdoc method
+ * @name function:i18n#format
+ * @methodOf function:format
+ * @description this function provides C-style's formatted sprintf().
+ *
+*/
+export function format(f) {
+    var i;
+    var formatRegExp = /%[sdj%]/g;
+    if (!isString(f)) {
+        var objects = [];
+        for (i = 0; i < arguments.length; i++) {
+            objects.push(JSON.stringify(arguments[i]));
+        }
+        return objects.join(' ');
+    }
+
+    i = 1;
+    var args = arguments;
+    var len = args.length;
+    var str = String(f).replace(formatRegExp, function(x) {
+        if (x === '%%') return '%';
+        if (i >= len) return x;
+        switch (x) {
+        case '%s': return String(args[i++]);
+        case '%d': return Number(args[i++]);
+        case '%j':
+        case '%j':
+            try {
+                return JSON.stringify(args[i++]);
+            } catch (_) {
+                return '[Circular]';
+            }
+        default:
+            return x;
+        }
+    });
+    for (var x = args[i]; i < len; x = args[++i]) {
+        if (isNull(x) || !isObject(x)) {
+            str += ' ' + x;
+        } else {
+            str += ' ' + JSON.stringify(x);
+        }
+    }
+    return str;
+}
+
+export default
+    angular.module('I18N', [])
+    .factory('I18NInit', ['$window', 'gettextCatalog',
+    function ($window, gettextCatalog) {
+        return function() {
+            var langInfo = $window.navigator.language ||
+                    $window.navigator.userLanguage;
+            var langUrl = langInfo.replace('-', '_');
+            //gettextCatalog.debug = true;
+            gettextCatalog.setCurrentLanguage(langInfo);
+            gettextCatalog.loadRemote('/static/languages/' + langUrl + '.json');
+        };
+    }])
+    .factory('i18n', ['gettextCatalog',
+    function (gettextCatalog) {
+        return {
+            _: function (s) { return gettextCatalog.getString (s); },
+            N_: N_,
+            format: format,
+            hasTranslation: function () {
+                return gettextCatalog.strings[gettextCatalog.currentLanguage] !== undefined;
+            }
+        };
+    }]);
diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
index 95ebed3458..db82043c41 100644
--- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
+++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js
@@ -10,17 +10,17 @@
  * @description This form is for adding/editing an organization
 */
 
-export default function() {
+export default ['i18n', function(i18n) {
     return {
 
-        addTitle: 'New Custom Inventory',
+        addTitle: i18n._('New Custom Inventory'),
         editTitle: '{{ name }}',
         name: 'custom_inventory',
         showActions: true,
 
         fields: {
             name: {
-                label: 'Name',
+                label: i18n._('Name'),
                 type: 'text',
                 addRequired: true,
                 editRequired: true,
@@ -28,14 +28,14 @@ export default function() {
                 ngDisabled: '!(inventory_script_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 type: 'text',
                 addRequired: false,
                 editRequired: false,
                 ngDisabled: '!(inventory_script_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             organization: {
-                label: 'Organization',
+                label: i18n._('Organization'),
                 type: 'lookup',
                 awRequiredWhen: {
                     reqExpression: "orgrequired",
@@ -47,7 +47,7 @@ export default function() {
                 ngDisabled: '!(inventory_script_obj.summary_fields.user_capabilities.edit || canAdd)'
             },
             script: {
-                label: 'Custom Script',
+                label: i18n._('Custom Script'),
                 type: 'textarea',
                 class: 'Form-formGroup--fullWidth',
                 elementClass: 'Form-monospace',
@@ -56,9 +56,9 @@ export default function() {
                 awDropFile: true,
                 ngDisabled: '!(inventory_script_obj.summary_fields.user_capabilities.edit || canAdd)',
                 rows: 10,
-                awPopOver: "
    Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. " +
-                                    "

     Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python
    ",
-                dataTitle: 'Custom Script',
+                awPopOver: i18n._("
    Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. " +
+                                    "

     Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python
    "),
+                dataTitle: i18n._('Custom Script'),
                 dataPlacement: 'right',
                 dataContainer: "body"
             },
@@ -80,4 +80,4 @@ export default function() {
             }
         }
     };
-}
+}];
diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
index ca48ecdecc..00ac179748 100644
--- a/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
+++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.list.js
@@ -6,10 +6,10 @@
 
 
 
-export default function(){
+export default ['i18n', function(i18n){
     return {
         name:  'inventory_scripts' ,
-        listTitle: 'Inventory Scripts',
+        listTitle: i18n._('Inventory Scripts'),
         iterator: 'inventory_script',
         index: false,
         hover: false,
@@ -17,17 +17,17 @@ export default function(){
         fields: {
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-md-3 col-sm-9 col-xs-9',
                 modalColumnClass: 'col-md-8'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 excludeModal: true,
                 columnClass: 'col-md-4 hidden-sm hidden-xs'
             },
             organization: {
-                label: 'Organization',
+                label: i18n._('Organization'),
                 ngBind: 'inventory_script.summary_fields.organization.name',
                 sourceModel: 'organization',
                 sourceField: 'name',
@@ -40,9 +40,9 @@ export default function(){
             add: {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addCustomInv()',
-                awToolTip: 'Create a new custom inventory',
+                awToolTip: i18n._('Create a new custom inventory'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: 'canAdd'
             }
         },
@@ -54,29 +54,29 @@ export default function(){
             edit: {
                 ngClick: "editCustomInv(inventory_script.id)",
                 icon: 'fa-edit',
-                label: 'Edit',
+                label: i18n._('Edit'),
                 "class": 'btn-sm',
-                awToolTip: 'Edit inventory script',
+                awToolTip: i18n._('Edit inventory script'),
                 dataPlacement: 'top',
                 ngShow: 'inventory_script.summary_fields.user_capabilities.edit'
             },
             view: {
                 ngClick: "editCustomInv(inventory_script.id)",
-                label: 'View',
+                label: i18n._('View'),
                 "class": 'btn-sm',
-                awToolTip: 'View inventory script',
+                awToolTip: i18n._('View inventory script'),
                 dataPlacement: 'top',
                 ngShow: '!inventory_script.summary_fields.user_capabilities.edit'
             },
             "delete": {
                 ngClick: "deleteCustomInv(inventory_script.id, inventory_script.name)",
                 icon: 'fa-trash',
-                label: 'Delete',
+                label: i18n._('Delete'),
                 "class": 'btn-sm',
-                awToolTip: 'Delete inventory script',
+                awToolTip: i18n._('Delete inventory script'),
                 dataPlacement: 'top',
                 ngShow: 'inventory_script.summary_fields.user_capabilities.delete'
             }
         }
     };
-}
+}];
diff --git a/awx/ui/client/src/job-templates/add/job-templates-add.route.js b/awx/ui/client/src/job-templates/add/job-templates-add.route.js
index b4ede48910..44bc3fd2f7 100644
--- a/awx/ui/client/src/job-templates/add/job-templates-add.route.js
+++ b/awx/ui/client/src/job-templates/add/job-templates-add.route.js
@@ -5,6 +5,7 @@
  *************************************************/
 
 import {templateUrl} from '../../shared/template-url/template-url.factory';
+import {N_} from "../../i18n";
 
 export default {
     name: 'jobTemplates.add',
@@ -13,7 +14,7 @@ export default {
     controller: 'JobTemplatesAdd',
     ncyBreadcrumb: {
         parent: "jobTemplates",
-        label: "CREATE JOB TEMPLATE"
+        label: N_("CREATE JOB TEMPLATE")
     },
     socket:{
         "groups":{
diff --git a/awx/ui/client/src/license/license.controller.js b/awx/ui/client/src/license/license.controller.js
index aac6b9446d..8b0cae9269 100644
--- a/awx/ui/client/src/license/license.controller.js
+++ b/awx/ui/client/src/license/license.controller.js
@@ -4,13 +4,15 @@
  * All Rights Reserved
  *************************************************/
 
+import {N_} from "../i18n";
+
 export default
     ['Wait', '$state', '$scope', '$rootScope', '$location', 'GetBasePath',
     'Rest', 'ProcessErrors', 'CheckLicense', 'moment','$window',
-    'ConfigService', 'FeaturesService', 'pendoService',
+    'ConfigService', 'FeaturesService', 'pendoService', 'i18n',
     function( Wait, $state, $scope, $rootScope, $location, GetBasePath, Rest,
         ProcessErrors, CheckLicense, moment, $window, ConfigService,
-        FeaturesService, pendoService){
+        FeaturesService, pendoService, i18n){
         $scope.getKey = function(event){
             // Mimic HTML5 spec, show filename
             $scope.fileName = event.target.files[0].name;
@@ -90,8 +92,9 @@ export default
         };
 
         var init = function(){
-            $scope.fileName = "No file selected.";
-            $scope.title = $rootScope.licenseMissing ? "Tower License" : "License Management";
+            // license/license.partial.html compares fileName
+            $scope.fileName = N_("No file selected.");
+            $scope.title = $rootScope.licenseMissing ? ("Tower " + i18n._("License")) : i18n._("License Management");
             Wait('start');
             ConfigService.getConfig().then(function(config){
                 $scope.license = config;
diff --git a/awx/ui/client/src/license/license.partial.html b/awx/ui/client/src/license/license.partial.html
index fb07180d7a..5adaa8ebde 100644
--- a/awx/ui/client/src/license/license.partial.html
+++ b/awx/ui/client/src/license/license.partial.html
@@ -2,91 +2,91 @@
 	ng-class="{'License-container--missing': licenseMissing}">
 	
    
 		
    
-			
    Details
    
+			
    Details
    
 			
    
 				
    
-					
    License
    
+					
    License
    
 					
    
-					Valid License
-					Invalid License
+					Valid License
+					Invalid License
 					
    
 				
    
 				
    
-					
    Version
    
+					
    Version
    
 					
    
 					{{license.version}}
 					
    
 				
    
 				
    
-					
    License Type
    
+					
    License Type
    
 					
    
 					{{license.license_info.license_type}}
 					
    
 				
    
 				
    
-					
    Subscription
    
+					
    Subscription
    
 					
    
 					{{license.license_info.subscription_name}}
 					
    
 				
    
 				
    
-					
    License Key
    
+					
    License Key
    
 					
    
 					{{license.license_info.license_key}}
 					
    
 				
    
 				
    
-					
    Expires On
    
+					
    Expires On
    
 					
    
 					{{time.expiresOn}}
 					
    
 				
    
 				
    
-					
    Time Remaining
    
+					
    Time Remaining
    
 					
    
 					{{time.remaining}}
 					
    
 				
    
 				
    
-					
    Hosts Available
    
+					
    Hosts Available
    
 					
    
 					{{license.license_info.available_instances}}
 					
    
 				
    
 				
    
-					
    Hosts Used
    
+					
    Hosts Used
    
 					
    
 					{{license.license_info.current_instances}}
 					
    
 				
    
 				
    
-					
    Hosts Remaining
    
+					
    Hosts Remaining
    
 					
    
 					{{license.license_info.free_instances}}
 					
    
 				
    
 			
    
-			
    If you are ready to upgrade, please contact us by clicking the button below
    
-			
+			
    If you are ready to upgrade, please contact us by clicking the button below
    
+			
 		
    
 	
    
 	
    
 		
    
 			
    {{title}}
    
 			
    
-				
    Welcome to Ansible Tower! Please complete the steps below to acquire a license.
    
+				
    Welcome to Ansible Tower! Please complete the steps below to acquire a license.
    
 				
    
 					
 						1
 					
 					
-						Please click the button below to visit Ansible's website to get a Tower license key.
+						Please click the button below to visit Ansible's website to get a Tower license key.
 					
 				
    
 
 					
 
 				
    
@@ -94,18 +94,18 @@
 						2
 					
 					
-						Choose your license file, agree to the End User License Agreement, and click submit.
+						Choose your license file, agree to the End User License Agreement, and click submit.
 					
 				
    
 
 				
    
-					
     License File
    
+					
     License File
    
 					
    
-						Browse
-						{{fileName}}
+						Browse
+                                                {{fileName|translate}}
 						
 					
    
-					
     End User License Agreement
+					
     End User License Agreement
 					
    
 					
    {{ license.eula }}
    
@@ -113,13 +113,13 @@
 						
    
 							
 						
    
 					
    
 					
    
-						
-						Save successful!
+						
+						Save successful!
 					
    
 				
 			
    
diff --git a/awx/ui/client/src/lists/CompletedJobs.js b/awx/ui/client/src/lists/CompletedJobs.js
index 319ee98074..bf586613c5 100644
--- a/awx/ui/client/src/lists/CompletedJobs.js
+++ b/awx/ui/client/src/lists/CompletedJobs.js
@@ -5,22 +5,21 @@
  *************************************************/
 
 
-
-
 export default
     angular.module('CompletedJobsDefinition', ['sanitizeFilter'])
-    .value( 'CompletedJobsList', {
+    .factory('CompletedJobsList', ['i18n', function(i18n) {
+    return {
         // These tooltip fields are consumed to build disabled related tabs tooltips in the form > add view
-        awToolTip: 'Please save and run a job to view',
+        awToolTip: i18n._('Please save and run a job to view'),
         dataPlacement: 'top',
         name: 'completed_jobs',
         basePath: 'job_templates/:id/jobs/?or__status=successful&or__status=failed&or__status=error&or__status=canceled',
         iterator: 'completed_job',
-        editTitle: 'Completed Jobs',
+        editTitle: i18n._('Completed Jobs'),
         index: false,
         hover: true,
         well: false,
-        emptyListText: 'No completed jobs',
+        emptyListText: i18n._('No completed jobs'),
 
         fields: {
             status: {
@@ -53,7 +52,7 @@ export default
                 dataPlacement: 'top'
             },
             name: {
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6',
                 searchable: false,
                 ngClick: "viewJobDetails(completed_job)",
@@ -61,7 +60,7 @@ export default
                 dataPlacement: 'top'
             },
             type: {
-                label: 'Type',
+                label: i18n._('Type'),
                 ngBind: 'completed_job.type_label',
                 link: false,
                 columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs",
@@ -70,7 +69,7 @@ export default
                 searchOptions: []    // populated via GetChoices() in controller
             },
             finished: {
-                label: 'Finished',
+                label: i18n._('Finished'),
                 noLink: true,
                 searchable: false,
                 filter: "longDate",
@@ -79,7 +78,7 @@ export default
                 desc: true
             },
             failed: {
-                label: 'Job failed?',
+                label: i18n._('Job failed?'),
                 searchSingleValue: true,
                 searchType: 'boolean',
                 searchValue: 'true',
@@ -110,4 +109,4 @@ export default
                 ngShow: 'completed_job.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/Credentials.js b/awx/ui/client/src/lists/Credentials.js
index d9496b1807..a46aa56d08 100644
--- a/awx/ui/client/src/lists/Credentials.js
+++ b/awx/ui/client/src/lists/Credentials.js
@@ -9,33 +9,34 @@
 
 export default
     angular.module('CredentialsListDefinition', [])
-    .value('CredentialList', {
+    .factory('CredentialList', ['i18n', function(i18n) {
+    return {
 
         name: 'credentials',
         iterator: 'credential',
-        selectTitle: 'Add Credentials',
-        editTitle: 'Credentials',
-        listTitle: 'Credentials',
+        selectTitle: i18n._('Add Credentials'),
+        editTitle: i18n._('Credentials'),
+        listTitle: i18n._('Credentials'),
         selectInstructions: "
    Select existing credentials by clicking each credential or checking the related checkbox. When " +
             "finished, click the blue Select button, located bottom right.
     
    Create a brand new credential by clicking ",
         index: false,
         hover: true,
-        emptyListText: 'No Credentials Have Been Created',
+        emptyListText: i18n._('No Credentials Have Been Created'),
 
         fields: {
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-md-3 col-sm-9 col-xs-9',
                 modalColumnClass: 'col-md-11'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 excludeModal: true,
                 columnClass: 'col-md-3 hidden-sm hidden-xs'
             },
             kind: {
-                label: 'Type',
+                label: i18n._('Type'),
                 searchType: 'select',
                 searchOptions: [], // will be set by Options call to credentials resource
                 excludeModal: true,
@@ -43,7 +44,7 @@ export default
                 columnClass: 'col-md-2 hidden-sm hidden-xs'
             },
             owners: {
-                label: 'Owners',
+                label: i18n._('Owners'),
                 type: 'owners',
                 searchable: false,
                 nosort: true,
@@ -56,9 +57,9 @@ export default
             add: {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addCredential()',
-                awToolTip: 'Create a new credential',
+                awToolTip: i18n._('Create a new credential'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD'
+                buttonContent: i18n._('+ ADD')
             }
         },
 
@@ -69,18 +70,18 @@ export default
             edit: {
                 ngClick: "editCredential(credential.id)",
                 icon: 'fa-edit',
-                label: 'Edit',
+                label: i18n._('Edit'),
                 "class": 'btn-sm',
-                awToolTip: 'Edit credential',
+                awToolTip: i18n._('Edit credential'),
                 dataPlacement: 'top',
                 ngShow: 'credential.summary_fields.user_capabilities.edit'
             },
 
             view: {
                 ngClick: "editCredential(credential.id)",
-                label: 'View',
+                label: i18n._('View'),
                 "class": 'btn-sm',
-                awToolTip: 'View credential',
+                awToolTip: i18n._('View credential'),
                 dataPlacement: 'top',
                 ngShow: '!credential.summary_fields.user_capabilities.edit'
             },
@@ -88,11 +89,11 @@ export default
             "delete": {
                 ngClick: "deleteCredential(credential.id, credential.name)",
                 icon: 'fa-trash',
-                label: 'Delete',
+                label: i18n._('Delete'),
                 "class": 'btn-sm',
-                awToolTip: 'Delete credential',
+                awToolTip: i18n._('Delete credential'),
                 dataPlacement: 'top',
                 ngShow: 'credential.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/Inventories.js b/awx/ui/client/src/lists/Inventories.js
index fec3b27c2d..4129079bb0 100644
--- a/awx/ui/client/src/lists/Inventories.js
+++ b/awx/ui/client/src/lists/Inventories.js
@@ -7,13 +7,14 @@
 
 export default
     angular.module('InventoriesListDefinition', [])
-    .value('InventoryList', {
+    .factory('InventoryList', ['i18n', function(i18n) {
+    return {
 
         name: 'inventories',
         iterator: 'inventory',
-        selectTitle: 'Add Inventories',
-        editTitle: 'Inventories',
-        listTitle: 'Inventories',
+        selectTitle: i18n._('Add Inventories'),
+        editTitle: i18n._('Inventories'),
+        listTitle: i18n._('Inventories'),
         selectInstructions: "Click on a row to select it, and click Finished when done. Click the  " +
             "button to create a new inventory.",
         index: false,
@@ -43,13 +44,13 @@ export default
             },
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-md-5 col-sm-5 col-xs-8 List-staticColumnAdjacent',
                 modalColumnClass: 'col-md-11',
                 linkTo: '/#/inventories/{{inventory.id}}/manage'
             },
             organization: {
-                label: 'Organization',
+                label: i18n._('Organization'),
                 ngBind: 'inventory.summary_fields.organization.name',
                 linkTo: '/#/organizations/{{ inventory.organization }}',
                 sourceModel: 'organization',
@@ -58,27 +59,27 @@ export default
                 columnClass: 'col-md-5 col-sm-3 hidden-xs'
             },
             has_inventory_sources: {
-                label: 'Cloud sourced?',
+                label: i18n._('Cloud sourced?'),
                 searchSingleValue: true,
                 searchType: 'boolean',
                 searchValue: 'true',
                 searchOnly: true
             },
             has_active_failures: {
-                label: 'Failed hosts?',
+                label: i18n._('Failed hosts?'),
                 searchSingleValue: true,
                 searchType: 'boolean',
                 searchValue: 'true',
                 searchOnly: true
             },
             inventory_sources_with_failures: {
-                label: 'Sync failures?',
+                label: i18n._('Sync failures?'),
                 searchType: 'select',
                 searchOptions: [{
-                    label: 'Yes',
+                    label: i18n._('Yes'),
                     value: 'inventory_sources_with_failures__gt=0'
                 }, {
-                    label: 'No',
+                    label: i18n._('No'),
                     value: 'inventory_sources_with_failures__lte=0'
                 }],
                 searchOnly: true
@@ -89,9 +90,9 @@ export default
             add: {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addInventory()',
-                awToolTip: 'Create a new inventory',
+                awToolTip: i18n._('Create a new inventory'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: 'canAdd'
             }
         },
@@ -101,25 +102,25 @@ export default
             columnClass: 'col-md-2 col-sm-4 col-xs-4',
 
             edit: {
-                label: 'Edit',
+                label: i18n._('Edit'),
                 ngClick: 'editInventory(inventory.id)',
-                awToolTip: 'Edit inventory',
+                awToolTip: i18n._('Edit inventory'),
                 dataPlacement: 'top',
                 ngShow: 'inventory.summary_fields.user_capabilities.edit'
             },
             view: {
-                label: 'View',
+                label: i18n._('View'),
                 ngClick: 'editInventory(inventory.id)',
-                awToolTip: 'View inventory',
+                awToolTip: i18n._('View inventory'),
                 dataPlacement: 'top',
                 ngShow: '!inventory.summary_fields.user_capabilities.edit'
             },
             "delete": {
-                label: 'Delete',
+                label: i18n._('Delete'),
                 ngClick: "deleteInventory(inventory.id, inventory.name)",
-                awToolTip: 'Delete inventory',
+                awToolTip: i18n._('Delete inventory'),
                 dataPlacement: 'top',
                 ngShow: 'inventory.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/JobTemplates.js b/awx/ui/client/src/lists/JobTemplates.js
index ce75bf3dd6..9beebb1919 100644
--- a/awx/ui/client/src/lists/JobTemplates.js
+++ b/awx/ui/client/src/lists/JobTemplates.js
@@ -7,13 +7,14 @@
 
 export default
     angular.module('JobTemplatesListDefinition', [])
-    .value('JobTemplateList', {
+    .factory('JobTemplateList', ['i18n', function(i18n) {
+    return {
 
         name: 'job_templates',
         iterator: 'job_template',
-        selectTitle: 'Add Job Template',
-        editTitle: 'Job Templates',
-        listTitle: 'Job Templates',
+        selectTitle: i18n._('Add Job Template'),
+        editTitle: i18n._('Job Templates'),
+        listTitle: i18n._('Job Templates'),
         selectInstructions: "Click on a row to select it, and click Finished when done. Use the  " +
             "button to create a new job template.",
         index: false,
@@ -22,15 +23,15 @@ export default
         fields: {
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-lg-2 col-md-2 col-sm-4 col-xs-9'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 columnClass: 'col-lg-2 hidden-md hidden-sm hidden-xs'
             },
             smart_status: {
-              label: 'Activity',
+              label: i18n._('Activity'),
               columnClass: 'List-tableCell col-lg-2 col-md-2 hidden-sm hidden-xs',
               searchable: false,
               nosort: true,
@@ -38,7 +39,7 @@ export default
               type: 'template'
             },
             labels: {
-                label: 'Labels',
+                label: i18n._('Labels'),
                 type: 'labels',
                 nosort: true,
                 columnClass: 'List-tableCell col-lg-4 col-md-4 hidden-sm hidden-xs',
@@ -53,9 +54,9 @@ export default
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addJobTemplate()',
                 basePaths: ['job_templates'],
-                awToolTip: 'Create a new template',
+                awToolTip: i18n._('Create a new template'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: 'canAdd'
             }
         },
@@ -65,52 +66,52 @@ export default
             columnClass: 'col-lg-2 col-md-3 col-sm-3 col-xs-3',
 
             submit: {
-                label: 'Launch',
+                label: i18n._('Launch'),
                 mode: 'all',
                 ngClick: 'submitJob(job_template.id)',
-                awToolTip: 'Start a job using this template',
+                awToolTip: i18n._('Start a job using this template'),
                 dataPlacement: 'top',
                 ngShow: 'job_template.summary_fields.user_capabilities.start'
             },
             schedule: {
-                label: 'Schedule',
+                label: i18n._('Schedule'),
                 mode: 'all',
                 ngClick: 'scheduleJob(job_template.id)',
-                awToolTip: 'Schedule future job template runs',
+                awToolTip: i18n._('Schedule future job template runs'),
                 dataPlacement: 'top',
                 ngShow: 'job_template.summary_fields.user_capabilities.schedule'
             },
             copy: {
-                label: 'Copy',
+                label: i18n._('Copy'),
                 'ui-sref': 'jobTemplates.copy({id: job_template.id})',
                 "class": 'btn-danger btn-xs',
-                awToolTip: 'Copy template',
+                awToolTip: i18n._('Copy template'),
                 dataPlacement: 'top',
                 ngShow: 'job_template.summary_fields.user_capabilities.copy'
             },
             edit: {
-                label: 'Edit',
+                label: i18n._('Edit'),
                 ngClick: "editJobTemplate(job_template.id)",
-                awToolTip: 'Edit template',
+                awToolTip: i18n._('Edit template'),
                 "class": 'btn-default btn-xs',
                 dataPlacement: 'top',
                 ngShow: 'job_template.summary_fields.user_capabilities.edit'
             },
             view: {
-                label: 'View',
+                label: i18n._('View'),
                 ngClick: "editJobTemplate(job_template.id)",
-                awToolTip: 'View template',
+                awToolTip: i18n._('View template'),
                 "class": 'btn-default btn-xs',
                 dataPlacement: 'top',
                 ngShow: '!job_template.summary_fields.user_capabilities.edit'
             },
             "delete": {
-                label: 'Delete',
+                label: i18n._('Delete'),
                 ngClick: "deleteJobTemplate(job_template.id, job_template.name)",
                 "class": 'btn-danger btn-xs',
-                awToolTip: 'Delete template',
+                awToolTip: i18n._('Delete template'),
                 dataPlacement: 'top',
                 ngShow: 'job_template.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/PortalJobTemplates.js b/awx/ui/client/src/lists/PortalJobTemplates.js
index dac5d942f2..c1f4fbd045 100644
--- a/awx/ui/client/src/lists/PortalJobTemplates.js
+++ b/awx/ui/client/src/lists/PortalJobTemplates.js
@@ -7,26 +7,27 @@
 
 export default
     angular.module('PortalJobTemplatesListDefinition', [])
-    .value('PortalJobTemplateList', {
+    .factory('PortalJobTemplateList', ['i18n', function(i18n) {
+    return {
 
         name: 'job_templates',
         iterator: 'job_template',
-        editTitle: 'Job Templates',
-        listTitle: 'Job Templates',
+        editTitle: i18n._('Job Templates'),
+        listTitle: i18n._('Job Templates'),
         index: false,
         hover: true,
         well: true,
-        emptyListText: 'There are no job templates to display at this time',
+        emptyListText: i18n._('There are no job templates to display at this time'),
         fields: {
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-lg-5 col-md-5 col-sm-9 col-xs-8',
                 linkTo: '/#/job_templates/{{job_template.id}}',
                 searchDefault: true
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 columnClass: 'col-lg-4 col-md-4 hidden-sm hidden-xs'
             }
         },
@@ -36,11 +37,11 @@ export default
 
         fieldActions: {
             submit: {
-                label: 'Launch',
+                label: i18n._('Launch'),
                 mode: 'all',
                 ngClick: 'submitJob(job_template.id)',
-                awToolTip: 'Start a job using this template',
+                awToolTip: i18n._('Start a job using this template'),
                 dataPlacement: 'top'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/PortalJobs.js b/awx/ui/client/src/lists/PortalJobs.js
index bc8fd40fa8..efdf87a747 100644
--- a/awx/ui/client/src/lists/PortalJobs.js
+++ b/awx/ui/client/src/lists/PortalJobs.js
@@ -7,16 +7,17 @@
 
 export default
     angular.module('PortalJobsListDefinition', [])
-    .value( 'PortalJobsList', {
+    .factory('PortalJobsList', ['i18n', function(i18n) {
+    return {
 
         name: 'jobs',
         iterator: 'job',
-        editTitle: 'Jobs',
+        editTitle: i18n._('Jobs'),
         index: false,
         hover: true,
         well: true,
-        listTitle: 'Jobs',
-        emptyListText: 'There are no jobs to display at this time',
+        listTitle: i18n._('Jobs'),
+        emptyListText: i18n._('There are no jobs to display at this time'),
 
         fields: {
             status: {
@@ -32,14 +33,14 @@ export default
                 searchLabel: 'Status'
             },
             name: {
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-lg-4 col-md-4 col-sm-4 col-xs-6 List-staticColumnAdjacent',
                 defaultSearchField: true,
                 linkTo: '/#/jobs/{{job.id}}',
                 searchDefault: true
             },
             finished: {
-                label: 'Finished',
+                label: i18n._('Finished'),
                 noLink: true,
                 searchable: false,
                 filter: "longDate",
@@ -50,4 +51,4 @@ export default
         },
 
         actions: { }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/Projects.js b/awx/ui/client/src/lists/Projects.js
index 93d940730a..600d76b29f 100644
--- a/awx/ui/client/src/lists/Projects.js
+++ b/awx/ui/client/src/lists/Projects.js
@@ -4,16 +4,16 @@
  * All Rights Reserved
  *************************************************/
 
-
 export default
     angular.module('ProjectsListDefinition', [])
-    .value('ProjectList', {
+    .factory('ProjectList', ['i18n', function(i18n) {
+    return {
 
         name: 'projects',
         iterator: 'project',
-        selectTitle: 'Add Project',
-        editTitle: 'Projects',
-        listTitle: 'Projects',
+        selectTitle: i18n._('Add Project'),
+        editTitle: i18n._('Projects'),
+        listTitle: i18n._('Projects'),
         selectInstructions: '
    Select existing projects by clicking each project or checking the related checkbox. When finished, click the blue ' +
             'Select button, located bottom right.
    Create a new project by clicking the  button.
    ',
         index: false,
@@ -38,19 +38,19 @@ export default
             name: {
                 key: true,
                 searchDefault: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: "col-lg-4 col-md-4 col-sm-5 col-xs-7 List-staticColumnAdjacent",
                 modalColumnClass: 'col-md-8'
             },
             scm_type: {
-                label: 'Type',
+                label: i18n._('Type'),
                 searchType: 'select',
                 searchOptions: [], // will be set by Options call to projects resource
                 excludeModal: true,
                 columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs'
             },
             last_updated: {
-                label: 'Last Updated',
+                label: i18n._('Last Updated'),
                 filter: "longDate",
                 columnClass: "col-lg-3 col-md-3 hidden-sm hidden-xs",
                 excludeModal: true,
@@ -63,18 +63,18 @@ export default
             add: {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addProject()',
-                awToolTip: 'Create a new project',
+                awToolTip: i18n._('Create a new project'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: "canAdd"
             },
             refresh: {
                 mode: 'all',
-                awToolTip: "Refresh the page",
+                awToolTip: i18n._("Refresh the page"),
                 ngClick: "refresh()",
                 ngShow: "socketStatus == 'error'",
                 actionClass: 'btn List-buttonDefault',
-                buttonContent: 'REFRESH'
+                buttonContent: i18n._('REFRESH')
             }
         },
 
@@ -100,28 +100,28 @@ export default
             },
             edit: {
                 ngClick: "editProject(project.id)",
-                awToolTip: 'Edit the project',
+                awToolTip: i18n._('Edit the project'),
                 dataPlacement: 'top',
                 ngShow: "project.summary_fields.user_capabilities.edit"
             },
             view: {
                 ngClick: "editProject(project.id)",
-                awToolTip: 'View the project',
+                awToolTip: i18n._('View the project'),
                 dataPlacement: 'top',
                 ngShow: "!project.summary_fields.user_capabilities.edit",
                 icon: 'fa-eye',
             },
             "delete": {
                 ngClick: "deleteProject(project.id, project.name)",
-                awToolTip: 'Delete the project',
+                awToolTip: i18n._('Delete the project'),
                 ngShow: "(project.status !== 'updating' && project.status !== 'running' && project.status !== 'pending')  && project.summary_fields.user_capabilities.delete",
                 dataPlacement: 'top'
             },
             cancel: {
                 ngClick: "cancelUpdate(project.id, project.name)",
-                awToolTip: 'Cancel the SCM update',
+                awToolTip: i18n._('Cancel the SCM update'),
                 ngShow: "(project.status == 'updating' || project.status == 'running' || project.status == 'pending') && project.summary_fields.user_capabilities.start",
                 dataPlacement: 'top'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/ScheduledJobs.js b/awx/ui/client/src/lists/ScheduledJobs.js
index 9f535c189e..b608e709b2 100644
--- a/awx/ui/client/src/lists/ScheduledJobs.js
+++ b/awx/ui/client/src/lists/ScheduledJobs.js
@@ -7,14 +7,15 @@
 
 export default
     angular.module('ScheduledJobsDefinition', ['sanitizeFilter'])
-    .value( 'ScheduledJobsList', {
+    .factory('ScheduledJobsList', ['i18n', function(i18n) {
+    return {
 
         name: 'schedules',
         iterator: 'schedule',
-        editTitle: 'Scheduled Jobs',
+        editTitle: i18n._('Scheduled Jobs'),
         hover: true,
         well: false,
-        emptyListText: 'No schedules exist',
+        emptyListText: i18n._('No schedules exist'),
 
         fields: {
             enabled: {
@@ -29,7 +30,7 @@ export default
                 dataPlacement: 'top'
             },
             name: {
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-lg-4 col-md-5 col-sm-5 col-xs-7 List-staticColumnAdjacent',
                 sourceModel: 'unified_job_template',
                 sourceField: 'name',
@@ -40,7 +41,7 @@ export default
                 defaultSearchField: true
             },
             type: {
-                label: 'Type',
+                label: i18n._('Type'),
                 noLink: true,
                 columnClass: "col-lg-2 col-md-2 hidden-sm hidden-xs",
                 sourceModel: 'unified_job_template',
@@ -52,15 +53,15 @@ export default
                 searchable: true,
                 searchType: 'select',
                 searchOptions: [
-                    { value: 'inventorysource', label: 'Inventory Sync' },
-                    { value: 'jobtemplate', label: 'Playbook Run' },
-                    { value: 'project', label: 'SCM Update' },
-                    { value: 'systemjobtemplate', label: 'Management Job'}
+                    { value: 'inventorysource', label: i18n._('Inventory Sync') },
+                    { value: 'jobtemplate', label: i18n._('Playbook Run') },
+                    { value: 'project', label: i18n._('SCM Update') },
+                    { value: 'systemjobtemplate', label: i18n._('Management Job')}
 
                 ]
             },
             next_run: {
-                label: 'Next Run',
+                label: i18n._('Next Run'),
                 noLink: true,
                 searchable: false,
                 columnClass: "col-lg-3 col-md-2 col-sm-3 hidden-xs",
@@ -77,23 +78,23 @@ export default
             "edit": {
                 mode: "all",
                 ngClick: "editSchedule(schedule)",
-                awToolTip: "Edit the schedule",
+                awToolTip: i18n._("Edit the schedule"),
                 dataPlacement: "top",
                 ngShow: 'schedule.summary_fields.user_capabilities.edit'
             },
             "view": {
                 mode: "all",
                 ngClick: "editSchedule(schedule)",
-                awToolTip: "View the schedule",
+                awToolTip: i18n._("View the schedule"),
                 dataPlacement: "top",
                 ngShow: '!schedule.summary_fields.user_capabilities.edit'
             },
             "delete": {
                 mode: 'all',
                 ngClick: 'deleteSchedule(schedule.id)',
-                awToolTip: 'Delete the schedule',
+                awToolTip: i18n._('Delete the schedule'),
                 dataPlacement: 'top',
                 ngShow: 'schedule.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/Teams.js b/awx/ui/client/src/lists/Teams.js
index 73fbfe38e2..a2ff5924d4 100644
--- a/awx/ui/client/src/lists/Teams.js
+++ b/awx/ui/client/src/lists/Teams.js
@@ -7,13 +7,14 @@
 
 export default
     angular.module('TeamsListDefinition', [])
-    .value('TeamList', {
+    .factory('TeamList', ['i18n', function(i18n) {
+    return {
 
         name: 'teams',
         iterator: 'team',
-        selectTitle: 'Add Team',
-        editTitle: 'Teams',
-        listTitle: 'Teams',
+        selectTitle: i18n._('Add Team'),
+        editTitle: i18n._('Teams'),
+        listTitle: i18n._('Teams'),
         selectInstructions: "Click on a row to select it, and click Finished when done. Click the  " +
             "button to create a new team.",
         index: false,
@@ -22,17 +23,17 @@ export default
         fields: {
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-lg-3 col-md-4 col-sm-9 col-xs-9',
                 modalColumnClass: 'col-md-8'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 columnClass: 'col-lg-3 col-md-3 hidden-sm hidden-xs',
                 excludeModal: true
             },
             organization: {
-                label: 'Organization',
+                label: i18n._('Organization'),
                 ngBind: 'team.organization_name',
                 sourceModel: 'organization',
                 sourceField: 'name',
@@ -45,9 +46,9 @@ export default
             add: {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addTeam()',
-                awToolTip: 'Create a new team',
+                awToolTip: i18n._('Create a new team'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: 'canAdd'
             }
         },
@@ -57,30 +58,30 @@ export default
             columnClass: 'col-lg-3 col-md-2 col-sm-3 col-xs-3',
 
             edit: {
-                label: 'Edit',
+                label: i18n._('Edit'),
                 ngClick: "editTeam(team.id)",
                 icon: 'icon-edit',
                 "class": 'btn-xs btn-default',
-                awToolTip: 'Edit team',
+                awToolTip: i18n._('Edit team'),
                 dataPlacement: 'top',
                 ngShow: 'team.summary_fields.user_capabilities.edit'
             },
             view: {
-                label: 'View',
+                label: i18n._('View'),
                 ngClick: "editTeam(team.id)",
                 "class": 'btn-xs btn-default',
-                awToolTip: 'View team',
+                awToolTip: i18n._('View team'),
                 dataPlacement: 'top',
                 ngShow: '!team.summary_fields.user_capabilities.edit'
             },
             "delete": {
-                label: 'Delete',
+                label: i18n._('Delete'),
                 ngClick: "deleteTeam(team.id, team.name)",
                 icon: 'icon-trash',
                 "class": 'btn-xs btn-danger',
-                awToolTip: 'Delete team',
+                awToolTip: i18n._('Delete team'),
                 dataPlacement: 'top',
                 ngShow: 'team.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/lists/Users.js b/awx/ui/client/src/lists/Users.js
index ad70d1c30f..14bb0f154b 100644
--- a/awx/ui/client/src/lists/Users.js
+++ b/awx/ui/client/src/lists/Users.js
@@ -7,13 +7,14 @@
 
 export default
     angular.module('UserListDefinition', [])
-    .value('UserList', {
+    .factory('UserList', ['i18n', function(i18n) {
+    return {
 
         name: 'users',
         iterator: 'user',
-        selectTitle: 'Add Users',
-        editTitle: 'Users',
-        listTitle: 'Users',
+        selectTitle: i18n._('Add Users'),
+        editTitle: i18n._('Users'),
+        listTitle: i18n._('Users'),
         selectInstructions: '
    Select existing users by clicking each user or checking the related checkbox. When finished, click the blue ' +
             'Select button, located bottom right.
     
    When available, a brand new user can be created by clicking the ' +
             ' button.
    ',
@@ -23,15 +24,15 @@ export default
         fields: {
             username: {
                 key: true,
-                label: 'Username',
+                label: i18n._('Username'),
                 columnClass: 'col-md-3 col-sm-3 col-xs-9'
             },
             first_name: {
-                label: 'First Name',
+                label: i18n._('First Name'),
                 columnClass: 'col-md-3 col-sm-3 hidden-xs'
             },
             last_name: {
-                label: 'Last Name',
+                label: i18n._('Last Name'),
                 columnClass: 'col-md-3 col-sm-3 hidden-xs'
             }
         },
@@ -42,9 +43,9 @@ export default
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addUser()',
                 basePaths: ['organizations', 'users'], // base path must be in list, or action not available
-                awToolTip: 'Create a new user',
+                awToolTip: i18n._('Create a new user'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: 'canAdd'
             }
         },
@@ -54,32 +55,32 @@ export default
             columnClass: 'col-md-3 col-sm-3 col-xs-3',
 
             edit: {
-                label: 'Edit',
+                label: i18n._('Edit'),
                 ngClick: "editUser(user.id)",
                 icon: 'icon-edit',
                 "class": 'btn-xs btn-default',
-                awToolTip: 'Edit user',
+                awToolTip: i18n._('Edit user'),
                 dataPlacement: 'top',
                 ngShow: 'user.summary_fields.user_capabilities.edit'
             },
 
             view: {
-                label: 'View',
+                label: i18n._('View'),
                 ngClick: "editUser(user.id)",
                 "class": 'btn-xs btn-default',
-                awToolTip: 'View user',
+                awToolTip: i18n._('View user'),
                 dataPlacement: 'top',
                 ngShow: '!user.summary_fields.user_capabilities.edit'
             },
 
             "delete": {
-                label: 'Delete',
+                label: i18n._('Delete'),
                 ngClick: "deleteUser(user.id, user.username)",
                 icon: 'icon-trash',
                 "class": 'btn-xs btn-danger',
-                awToolTip: 'Delete user',
+                awToolTip: i18n._('Delete user'),
                 dataPlacement: 'top',
                 ngShow: 'user.summary_fields.user_capabilities.delete'
             }
         }
-    });
+    };}]);
diff --git a/awx/ui/client/src/login/loginModal/loginModal.partial.html b/awx/ui/client/src/login/loginModal/loginModal.partial.html
index 74a0c4fd43..56d811a200 100644
--- a/awx/ui/client/src/login/loginModal/loginModal.partial.html
+++ b/awx/ui/client/src/login/loginModal/loginModal.partial.html
@@ -10,7 +10,7 @@
                     ng-src="/static/assets/{{ customLogo }}" >
             
    
             
    
-                
    
+                
    
                     Welcome to Ansible Tower!  Please sign in.
                 
    
                 
    
@@ -43,7 +43,7 @@
                     autocomplete="off" novalidate>
                     
    
                         
                         
    
                             
                     
    
                         
                         
    
                             
                     
                 
    
diff --git a/awx/ui/client/src/main-menu/main-menu.partial.html b/awx/ui/client/src/main-menu/main-menu.partial.html
index 6af41a58ad..558d733197 100644
--- a/awx/ui/client/src/main-menu/main-menu.partial.html
+++ b/awx/ui/client/src/main-menu/main-menu.partial.html
@@ -16,7 +16,7 @@
             href="/#/projects"
             ng-class="{'is-currentRoute' : isCurrentState('projects')}">
             
-                PROJECTS
+                PROJECTS
             
         
         
             
-                INVENTORIES
+                INVENTORIES
             
         
         
             
-                JOB TEMPLATES
+                JOB TEMPLATES
             
         
         
             
-                JOBS
+                JOBS
             
         
         
             
-                VIEW USER PAGE FOR {{ $root.current_user.username | uppercase }}
+                VIEW USER PAGE FOR {{ $root.current_user.username | uppercase }}
             
         
         
             
-                SETTINGS
+                SETTINGS
             
         
         
             
-                PORTAL MODE
+                PORTAL MODE
             
         
         
             
-                VIEW DOCUMENTATION
+                VIEW DOCUMENTATION
             
         
         
             
-                LOG OUT
+                LOG OUT
             
         
     
@@ -92,7 +92,7 @@
         ng-hide="licenseMissing"
         ng-class="{'is-currentRoute' : isCurrentState('projects'), 'is-loggedOut' : !current_user || !current_user.username}">
         
-            PROJECTS
+            PROJECTS
         
     
     
         
-            INVENTORIES
+            INVENTORIES
         
     
     
         
-            JOB TEMPLATES
+            JOB TEMPLATES
         
     
     
         
-            JOBS
+            JOBS
         
     
     
@@ -157,7 +157,7 @@
         ng-href="/#/portal"
         ng-hide="licenseMissing"
         ng-class="{'is-currentRoute' : isCurrentState('portalMode'), 'is-loggedOut' : !current_user || !current_user.username}"
-        aw-tool-tip="My View"
+        aw-tool-tip="{{'My View'|translate}}"
         data-placement="bottom"
         data-trigger="hover"
         data-container="body">
@@ -170,7 +170,7 @@
         ng-href="http://docs.ansible.com/ansible-tower/"
         ng-hide="licenseMissing"
         ng-class="{'is-loggedOut' : !current_user || !current_user.username}"
-        aw-tool-tip="View Documentation"
+        aw-tool-tip="{{'View Documentation'|translate}}"
         data-placement="bottom"
         data-trigger="hover"
         data-container="body"
@@ -185,7 +185,7 @@
         ng-class="{'is-currentRoute' : isCurrentState('logout'),
             'is-loggedOut' : !current_user || !current_user.username,
             'MainMenu-item--licenseMissing' : licenseMissing}"
-        aw-tool-tip="Log Out"
+        aw-tool-tip="{{'Log Out'|translate}}"
         data-placement="bottom"
         data-trigger="hover"
         data-container="body"
diff --git a/awx/ui/client/src/management-jobs/card/card.partial.html b/awx/ui/client/src/management-jobs/card/card.partial.html
index 0b90bf8bdc..b8a370916d 100644
--- a/awx/ui/client/src/management-jobs/card/card.partial.html
+++ b/awx/ui/client/src/management-jobs/card/card.partial.html
@@ -1,7 +1,7 @@
 
    
 
    
 	
    
-	    
    
+	    
    
 	        Management Jobs
 	    
    
 	    
@@ -18,18 +18,18 @@
 					
 					
 					
 				
    
diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js
index b796bb5ae2..a8c83c320c 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.form.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.form.js
@@ -10,20 +10,20 @@
  * @description This form is for adding/editing an organization
 */
 
-export default function() {
+export default ['i18n', function(i18n) {
     return {
 
-        addTitle: 'New Notification Template',
+        addTitle: i18n._('New Notification Template'),
         editTitle: '{{ name }}',
         name: 'notification_template',
         showActions: true,
         subFormTitles: {
-            typeSubForm: 'Type Details',
+            typeSubForm: i18n._('Type Details'),
         },
 
         fields: {
             name: {
-                label: 'Name',
+                label: i18n._('Name'),
                 type: 'text',
                 addRequired: true,
                 editRequired: true,
@@ -31,14 +31,14 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             description: {
-                label: 'Description',
+                label: i18n._('Description'),
                 type: 'text',
                 addRequired: false,
                 editRequired: false,
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             organization: {
-                label: 'Organization',
+                label: i18n._('Organization'),
                 type: 'lookup',
                 sourceModel: 'organization',
                 sourceField: 'name',
@@ -50,7 +50,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             notification_type: {
-                label:  'Type',
+                label:  i18n._('Type'),
                 type: 'select',
                 addRequired: true,
                 editRequired: true,
@@ -61,7 +61,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             username: {
-                label: 'Username',
+                label: i18n._('Username'),
                 type: 'text',
                 ngShow: "notification_type.value == 'email' ",
                 subForm: 'typeSubForm',
@@ -69,7 +69,7 @@ export default function() {
             },
 
             host: {
-                label: 'Host',
+                label: i18n._('Host'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "email_required",
@@ -80,7 +80,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             sender: {
-                label: 'Sender Email',
+                label: i18n._('Sender Email'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "email_required",
@@ -91,12 +91,12 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             recipients: {
-                label: 'Recipient List',
+                label: i18n._('Recipient List'),
                 type: 'textarea',
                 rows: 3,
-                awPopOver: '
    Type an option on each line.
    '+
-                            '
    For example:
    alias1@email.com
    \n alias2@email.com
    \n',
-                dataTitle: 'Recipient List',
+                awPopOver: i18n._('
    Type an option on each line.
    '+
+                            '
    For example:
    alias1@email.com
    \n alias2@email.com
    \n'),
+                dataTitle: i18n._('Recipient List'),
                 dataPlacement: 'right',
                 dataContainer: "body",
                 awRequiredWhen: {
@@ -135,12 +135,12 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             channels: {
-                label: 'Destination Channels',
+                label: i18n._('Destination Channels'),
                 type: 'textarea',
                 rows: 3,
-                awPopOver: '
    Type an option on each line. The pound symbol (#) is not required.
    '+
-                            '
    For example:
    engineering
    \n #support
    \n',
-                dataTitle: 'Destination Channels',
+                awPopOver: i18n._('
    Type an option on each line. The pound symbol (#) is not required.
    '+
+                            '
    For example:
    engineering
    \n #support
    \n'),
+                dataTitle: i18n._('Destination Channels'),
                 dataPlacement: 'right',
                 dataContainer: "body",
                 awRequiredWhen: {
@@ -152,12 +152,12 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             rooms: {
-                label: 'Destination Channels',
+                label: i18n._('Destination Channels'),
                 type: 'textarea',
                 rows: 3,
-                awPopOver: '
    Type an option on each line. The pound symbol (#) is not required.
    '+
-                            '
    For example:
    engineering
    \n #support
    \n',
-                dataTitle: 'Destination Channels',
+                awPopOver: i18n._('
    Type an option on each line. The pound symbol (#) is not required.
    '+
+                            '
    For example:
    engineering
    \n #support
    \n'),
+                dataTitle: i18n._('Destination Channels'),
                 dataPlacement: 'right',
                 dataContainer: "body",
                 awRequiredWhen: {
@@ -181,7 +181,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             account_token: {
-                label: 'Account Token',
+                label: i18n._('Account Token'),
                 type: 'sensitive',
                 hasShowInputButton: true,
                 awRequiredWhen: {
@@ -193,10 +193,10 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             from_number: {
-                label: 'Source Phone Number',
+                label: i18n._('Source Phone Number'),
                 type: 'text',
-                awPopOver: '
    Number associated with the "Messaging Service" in Twilio.
    '+
-                            '
    This must be of the form +18005550199.
    ',
+                awPopOver: i18n._('
    Number associated with the "Messaging Service" in Twilio.
    '+
+                            '
    This must be of the form +18005550199.
    '),
                 awRequiredWhen: {
                     reqExpression: "twilio_required",
                     init: "false"
@@ -206,12 +206,12 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             to_numbers: {
-                label: 'Destination SMS Number',
+                label: i18n._('Destination SMS Number'),
                 type: 'textarea',
                 rows: 3,
-                awPopOver: '
    Type an option on each line.
    '+
-                            '
    For example:
    +12125552368
    \n+19105556162
    \n',
-                dataTitle: 'Destination SMS Number',
+                awPopOver: i18n._('
    Type an option on each line.
    '+
+                            '
    For example:
    +12125552368
    \n+19105556162
    \n'),
+                dataTitle: i18n._('Destination SMS Number'),
                 dataPlacement: 'right',
                 dataContainer: "body",
                 awRequiredWhen: {
@@ -223,7 +223,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             account_sid: {
-                label: 'Account SID',
+                label: i18n._('Account SID'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "twilio_required",
@@ -234,7 +234,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             subdomain: {
-                label: 'Pagerduty subdomain',
+                label: i18n._('Pagerduty subdomain'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "pagerduty_required",
@@ -245,7 +245,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             service_key: {
-                label: 'API Service/Integration Key',
+                label: i18n._('API Service/Integration Key'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "pagerduty_required",
@@ -256,7 +256,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             client_name: {
-                label: 'Client Identifier',
+                label: i18n._('Client Identifier'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "pagerduty_required",
@@ -267,7 +267,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             message_from: {
-                label: 'Label to be shown with notification',
+                label: i18n._('Label to be shown with notification'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "hipchat_required",
@@ -290,10 +290,10 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             color: {
-                label: 'Notification Color',
+                label: i18n._('Notification Color'),
                 type: 'text',
-                awPopOver: '
    Color can be one of yellow, green, red, ' +
-                           'purple, gray, or random.\n',
+                awPopOver: i18n._('
    Color can be one of yellow, green, red, ' +
+                           'purple, gray, or random.\n'),
                 awRequiredWhen: {
                     reqExpression: "hipchat_required",
                     init: "false"
@@ -303,14 +303,14 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             notify: {
-                label: 'Notify Channel',
+                label: i18n._('Notify Channel'),
                 type: 'checkbox',
                 ngShow: "notification_type.value == 'hipchat' ",
                 subForm: 'typeSubForm',
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             url: {
-                label: 'Target URL',
+                label: i18n._('Target URL'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "webhook_required",
@@ -321,7 +321,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             headers: {
-                label: 'HTTP Headers',
+                label: i18n._('HTTP Headers'),
                 type: 'textarea',
                 rows: 5,
                 'class': 'Form-formGroup--fullWidth',
@@ -329,20 +329,20 @@ export default function() {
                     reqExpression: "webhook_required",
                     init: "false"
                 },
-                awPopOver: '
    Specify HTTP Headers in JSON format
    ' +
+                awPopOver: i18n._('
    Specify HTTP Headers in JSON format
    ' +
                            '
    For example:
    \n' +
                            '{\n' +
                            '  "X-Auth-Token": "828jf0",\n' +
                            '  "X-Ansible": "Is great!"\n' +
                            '}\n' +
-                           '
    ',
+                           '
    '),
                 dataPlacement: 'right',
                 ngShow: "notification_type.value == 'webhook' ",
                 subForm: 'typeSubForm',
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             server: {
-                label: 'IRC Server Address',
+                label: i18n._('IRC Server Address'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "irc_required",
@@ -353,7 +353,7 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             nickname: {
-                label: 'IRC Nick',
+                label: i18n._('IRC Nick'),
                 type: 'text',
                 awRequiredWhen: {
                     reqExpression: "irc_required",
@@ -364,12 +364,12 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             targets: {
-                label: 'Destination Channels or Users',
+                label: i18n._('Destination Channels or Users'),
                 type: 'textarea',
                 rows: 3,
-                awPopOver: '
    Type an option on each line. The pound symbol (#) is not required.
    '+
-                            '
    For example:
    #support or support
    \n @username or username
    \n',
-                dataTitle: 'Destination Channels',
+                awPopOver: i18n._('
    Type an option on each line. The pound symbol (#) is not required.
    '+
+                            '
    For example:
    #support or support
    \n @username or username
    \n'),
+                dataTitle: i18n._('Destination Channels'),
                 dataPlacement: 'right',
                 dataContainer: "body",
                 awRequiredWhen: {
@@ -381,27 +381,27 @@ export default function() {
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             use_ssl: {
-                label: 'SSL Connection',
+                label: i18n._('SSL Connection'),
                 type: 'checkbox',
                 ngShow: "notification_type.value == 'irc'",
                 subForm: 'typeSubForm',
                 ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
             },
             checkbox_group: {
-                label: 'Options',
+                label: i18n._('Options'),
                 type: 'checkbox_group',
                 subForm: 'typeSubForm',
                 ngShow: "notification_type.value == 'email'",
                 fields: [{
                     name: 'use_tls',
-                    label: 'Use TLS',
+                    label: i18n._('Use TLS'),
                     type: 'checkbox',
                     ngShow: "notification_type.value == 'email' ",
                     labelClass: 'checkbox-options stack-inline',
                     ngDisabled: '!(notification_template.summary_fields.user_capabilities.edit || canAdd)'
                 }, {
                     name: 'use_ssl',
-                    label: 'Use SSL',
+                    label: i18n._('Use SSL'),
                     type: 'checkbox',
                     ngShow: "notification_type.value == 'email'",
                     labelClass: 'checkbox-options stack-inline',
@@ -426,4 +426,4 @@ export default function() {
             }
         }
     };
-}
+}];
diff --git a/awx/ui/client/src/notifications/notificationTemplates.list.js b/awx/ui/client/src/notifications/notificationTemplates.list.js
index 58d0794d4a..2c6f54f08c 100644
--- a/awx/ui/client/src/notifications/notificationTemplates.list.js
+++ b/awx/ui/client/src/notifications/notificationTemplates.list.js
@@ -8,10 +8,10 @@
   * off of the settings page
   */
 
-export default function(){
+export default ['i18n', function(i18n){
     return {
         name:  'notification_templates' ,
-        listTitle: 'Notification Templates',
+        listTitle: i18n._('Notification Templates'),
         iterator: 'notification_template',
         index: false,
         hover: false,
@@ -30,12 +30,12 @@ export default function(){
             },
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-md-3 col-sm-9 col-xs-9',
                 linkTo: '/#/notification_templates/{{notification_template.id}}'
             },
             notification_type: {
-                    label: 'Type',
+                    label: i18n._('Type'),
                     searchType: 'select',
                     searchOptions: [],
                     excludeModal: true,
@@ -47,9 +47,9 @@ export default function(){
             add: {
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addNotification()',
-                awToolTip: 'Create a new custom inventory',
+                awToolTip: i18n._('Create a new custom inventory'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD',
+                buttonContent: i18n._('+ ADD'),
                 ngShow: 'canAdd'
             }
         },
@@ -60,38 +60,38 @@ export default function(){
             test: {
                 ngClick: "testNotification(notification_template.id)",
                 icon: 'fa-bell-o',
-                label: 'Edit',
+                label: i18n._('Edit'),
                 "class": 'btn-sm',
-                awToolTip: 'Test notification',
+                awToolTip: i18n._('Test notification'),
                 dataPlacement: 'top',
                 ngShow: 'notification_template.summary_fields.user_capabilities.edit'
             },
             edit: {
                 ngClick: "editNotification(notification_template.id)",
                 icon: 'fa-edit',
-                label: 'Edit',
+                label: i18n._('Edit'),
                 "class": 'btn-sm',
-                awToolTip: 'Edit notification',
+                awToolTip: i18n._('Edit notification'),
                 dataPlacement: 'top',
                 ngShow: 'notification_template.summary_fields.user_capabilities.edit'
             },
             view: {
                 ngClick: "editNotification(notification_template.id)",
-                label: 'View',
+                label: i18n._('View'),
                 "class": 'btn-sm',
-                awToolTip: 'View notification',
+                awToolTip: i18n._('View notification'),
                 dataPlacement: 'top',
                 ngShow: '!notification_template.summary_fields.user_capabilities.edit'
             },
             "delete": {
                 ngClick: "deleteNotification(notification_template.id, notification_template.name)",
                 icon: 'fa-trash',
-                label: 'Delete',
+                label: i18n._('Delete'),
                 "class": 'btn-sm',
-                awToolTip: 'Delete notification',
+                awToolTip: i18n._('Delete notification'),
                 dataPlacement: 'top',
                 ngShow: 'notification_template.summary_fields.user_capabilities.delete'
             }
         }
     };
-}
+}];
diff --git a/awx/ui/client/src/notifications/notifications.list.js b/awx/ui/client/src/notifications/notifications.list.js
index ed74e0b12b..688047d370 100644
--- a/awx/ui/client/src/notifications/notifications.list.js
+++ b/awx/ui/client/src/notifications/notifications.list.js
@@ -8,13 +8,13 @@
   * used in the related tabs
   */
 
-export default function(){
+export default ['i18n', function(i18n){
     return {
         // These tooltip fields are consumed to build disabled related tabs tooltips in the form > add view
         dataPlacement: 'top',
-        awToolTip: 'Please save before adding notifications',
+        awToolTip: i18n._('Please save before adding notifications'),
         name:  'notifications' ,
-        title: 'Notifications',
+        title: i18n._('Notifications'),
         iterator: 'notification',
         index: false,
         hover: false,
@@ -23,19 +23,19 @@ export default function(){
         fields: {
             name: {
                 key: true,
-                label: 'Name',
+                label: i18n._('Name'),
                 columnClass: 'col-md-3 col-sm-9 col-xs-9',
                 linkTo: '/#/notification_templates/{{notifier.id}}',
             },
             notification_type: {
-                label: 'Type',
+                label: i18n._('Type'),
                 searchType: 'select',
                 searchOptions: [],
                 excludeModal: true,
                 columnClass: 'col-md-4 hidden-sm hidden-xs'
             },
             notification_templates_success: {
-                label: 'Success',
+                label: i18n._('Success'),
                 flag: 'notification_templates_success',
                 type: "toggle",
                 ngClick: "toggleNotification($event, notification.id, \"notification_templates_success\")",
@@ -46,7 +46,7 @@ export default function(){
                 nosort: true,
             },
             notification_templates_error: {
-                label: 'Failure',
+                label: i18n._('Failure'),
                 columnClass: 'NotifierList-lastColumn',
                 flag: 'notification_templates_error',
                 type: "toggle",
@@ -63,12 +63,12 @@ export default function(){
                 label: 'Add Notification',
                 mode: 'all', // One of: edit, select, all
                 ngClick: 'addNotificationTemplate()',
-                awToolTip: 'Create a new notification template',
+                awToolTip: i18n._('Create a new notification template'),
                 actionClass: 'btn List-buttonSubmit',
-                buttonContent: '+ ADD NOTIFICATION TEMPLATE',
+                buttonContent: i18n._('+ ADD NOTIFICATION TEMPLATE'),
                 ngShow: 'current_user.is_superuser || (current_user_admin_orgs && current_user_admin_orgs.length > 0)'
             }
         }
 
     };
-}
+}];
diff --git a/awx/ui/client/src/notifications/shared/type-change.service.js b/awx/ui/client/src/notifications/shared/type-change.service.js
index 0827e88b34..bb1b6f0bed 100644
--- a/awx/ui/client/src/notifications/shared/type-change.service.js
+++ b/awx/ui/client/src/notifications/shared/type-change.service.js
@@ -4,8 +4,8 @@
  * All Rights Reserved
  *************************************************/
 
-export default [
-function () {
+export default ['i18n',
+function (i18n) {
     return{
         getDetailFields: function(type) {
             var obj = {};
@@ -24,20 +24,20 @@ function () {
             obj.room_required = false;
             switch (type) {
                 case 'email':
-                    obj.portLabel = ' Port';
-                    obj.passwordLabel = ' Password';
+                    obj.portLabel = ' ' + i18n._('Port');
+                    obj.passwordLabel = ' ' + i18n._('Password');
                     obj.email_required = true;
                     obj.port_required = true;
                     obj.password_required = false;
                     break;
                 case 'slack':
-                    obj.tokenLabel =' Token';
+                    obj.tokenLabel =' ' + i18n._('Token');
                     obj.slack_required = true;
                     obj.token_required = true;
                     obj.channel_required = true;
                     break;
                 case 'hipchat':
-                    obj.tokenLabel = ' Token';
+                    obj.tokenLabel = ' ' + i18n._('Token');
                     obj.hipchat_required = true;
                     obj.room_required = true;
                     obj.token_required = true;
@@ -49,13 +49,13 @@ function () {
                     obj.webhook_required = true;
                     break;
                 case 'pagerduty':
-                    obj.tokenLabel = ' API Token';
+                    obj.tokenLabel = ' ' + i18n._('API Token');
                     obj.pagerduty_required = true;
                     obj.token_required = true;
                     break;
                 case 'irc':
-                    obj.portLabel = ' IRC Server Port';
-                    obj.passwordLabel = ' IRC Server Password';
+                    obj.portLabel = ' ' + i18n._('IRC Server Port');
+                    obj.passwordLabel = ' ' + i18n._('IRC Server Password');
                     obj.irc_required = true;
                     obj.password_required = true;
                     obj.port_required = true;
diff --git a/awx/ui/client/src/organizations/list/organizations-list.partial.html b/awx/ui/client/src/organizations/list/organizations-list.partial.html
index 9746cc5756..72da4ffa40 100644
--- a/awx/ui/client/src/organizations/list/organizations-list.partial.html
+++ b/awx/ui/client/src/organizations/list/organizations-list.partial.html
@@ -3,18 +3,19 @@
     
    
         
    
             
    
-                
    
-                    organizations
+                
    
+                    ORGANIZATIONS
                 
    
                 
                     {{ orgCount }}
                 
             
    
             
    
+                
                 
             
    
@@ -22,7 +23,7 @@
         
    
             
    
             
    
-            
    PLEASE ADD ITEMS TO THIS LIST
    
+            
    PLEASE ADD ITEMS TO THIS LIST
    
             
    
                 
    
     
  • 
-        {{step.ncyBreadcrumbLabel}}
+        {{step.ncyBreadcrumbLabel|translate}}
     
    • 
     
  • 
-        {{step.ncyBreadcrumbLabel}}
+        {{step.ncyBreadcrumbLabel|translate}}
     
    • 
 
diff --git a/awx/ui/client/src/partials/jobs.html b/awx/ui/client/src/partials/jobs.html
index a36b785d33..b7fa8d808e 100644
--- a/awx/ui/client/src/partials/jobs.html
+++ b/awx/ui/client/src/partials/jobs.html
@@ -7,17 +7,17 @@
                     
                     
                 
    
                 
    
-                    
                 
    
             
    
diff --git a/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html b/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html
index 22bf88e899..cd8aec3812 100644
--- a/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html
+++ b/awx/ui/client/src/portal-mode/portal-mode-jobs.partial.html
@@ -3,13 +3,13 @@
 		
    
 		    
+		    ng-click='filterUser()' class="btn btn-xs" translate>My Jobs
 		    
+		    'btn-default' : activeFilter != 'all'}" ng-click='filterAll()' class="btn btn-xs btn-default" translate>All Jobs
 		
    
 		
    
 			
 		
    
 	
    
diff --git a/awx/ui/client/src/setup-menu/setup-menu.partial.html b/awx/ui/client/src/setup-menu/setup-menu.partial.html
index fc9a04d4ed..f8f6276cec 100644
--- a/awx/ui/client/src/setup-menu/setup-menu.partial.html
+++ b/awx/ui/client/src/setup-menu/setup-menu.partial.html
@@ -1,57 +1,57 @@
 
    
     
    
         
-            
    Organizations
    
-            
    
+            
    Organizations
    
+            
    
             Group all of your content to manage permissions across departments in your company.
             
    
             
         
-            
    Users
    
-            
    
+            
    Users
    
+            
    
               Allow others to sign into Tower and own the content they create.
             
    
             
         
-            
    Teams
    
-            
    
+            
    Teams
    
+            
    
               Split up your organization to associate content and control permissions for groups.
             
    
             
         
-            
    Credentials
    
-            
    
+            
    Credentials
    
+            
    
               Add passwords, SSH keys, etc. for Tower to use when launching jobs against machines, or when syncing inventories or projects.
             
    
             
         
-            
    Management Jobs
    
-            
    
+            
    Management Jobs
    
+            
    
                 Manage the cleanup of old job history, activity streams, data marked for deletion, and system tracking info.
             
    
             
         
-            
    Inventory Scripts
    
-            
    
+            
    Inventory Scripts
    
+            
    
             Create and edit scripts to dynamically load hosts from any source.
             
    
             
         
-            
    Notifications
    
-            
    
+            
    Notifications
    
+            
    
             Create templates for sending notifications with Email, HipChat, Slack, and SMS.
             
    
             
         
-          
    View Your License
    
-          
    
+          
    View Your License
    
+          
    
           View and edit your license information.
           
    
             
         
-          
    About Tower
    
-          
    
+          
    About Tower
    
+          
    
           View information about this version of Ansible Tower.
           
    
           
diff --git a/awx/ui/client/src/shared/form-generator.js b/awx/ui/client/src/shared/form-generator.js
index 821857e3f6..86622485fa 100644
--- a/awx/ui/client/src/shared/form-generator.js
+++ b/awx/ui/client/src/shared/form-generator.js
@@ -142,10 +142,11 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
 .factory('GenerateForm', ['$rootScope', '$location', '$compile', 'generateList',
     'SearchWidget', 'PaginateWidget', 'Attr', 'Icon', 'Column',
     'NavigationLink', 'HelpCollapse', 'DropDown', 'Empty', 'SelectIcon',
-    'Store', 'ActionButton', 'getSearchHtml',
+    'Store', 'ActionButton', 'getSearchHtml', 'i18n',
     function ($rootScope, $location, $compile, GenerateList, SearchWidget,
         PaginateWidget, Attr, Icon, Column, NavigationLink, HelpCollapse,
-        DropDown, Empty, SelectIcon, Store, ActionButton, getSearchHtml) {
+        DropDown, Empty, SelectIcon, Store, ActionButton, getSearchHtml,
+        i18n) {
         return {
 
             setForm: function (form) { this.form = form; },
@@ -875,20 +876,27 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         // Add error messages
                         if ((options.mode === 'add' && field.addRequired) || (options.mode === 'edit' && field.editRequired) ||
                             field.awRequiredWhen) {
+                            var error_message = i18n._("Please enter a value.");
                             html += "
    " + (field.requiredErrorMsg ? field.requiredErrorMsg : "Please enter a value.") + "
    \n";
+                                this.form.name + '_form.' + fld + ".$error.required\">" + (field.requiredErrorMsg ? field.requiredErrorMsg : error_message) + "
    \n";
                         }
                         if (field.type === "email") {
+                            var error_message = i18n._("Please enter a valid email address.");
                             html += "
    Please enter a valid email address.
    \n";
+                                this.form.name + '_form.' + fld + ".$error.email\">" +
+                                error_message + "
    \n";
                         }
                         if (field.awPassMatch) {
+                            var error_message = i18n._("This value does not match the password you entered previously.  Please confirm that password.");
                             html += "
    This value does not match the password you entered previously.  Please confirm that password.
    \n";
+                                ".$error.awpassmatch\">" +
+                                error_message + "
    \n";
                         }
                         if (field.awValidUrl) {
+                            var error_message = i18n._("Please enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character.");
                             html += "
    Please enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character. 
    \n";
+                                ".$error.awvalidurl\">" +
+                                error_message + "
    \n";
                         }
 
                         html += "
    \n";
@@ -901,7 +909,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
 
                     //fields with sensitive data that needs to be obfuscated from view
                     if (field.type === 'sensitive') {
-                        field.showInputInnerHTML = "Show";
+                        field.showInputInnerHTML = i18n._("Show");
                         field.inputType = "password";
 
                         html += "\t" + label();
@@ -918,6 +926,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                                     $(inputId).attr("type", "password");
                                 }
                             };
+                            var tooltip = i18n._("Toggle the display of plaintext.");
                             html += "\
    \n";
@@ -925,7 +934,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                             html += "\n";
                             html += "
    \n";
+                                this.form.name + "_form." + fld + ".$error.required'>\n" + (field.requiredErrorMsg ? field.requiredErrorMsg : error_message) + "\n
    \n";
                         }
                         if (field.type === "email") {
+                            var error_message = i18n._("Please enter a valid email address.");
                             html += "
    \nPlease enter a valid email address.\n
    \n";
+                                this.form.name + "_form." + fld + ".$error.email'>\n" +
+                                error_message + "\n
    \n";
                         }
                         if (field.awPassMatch) {
+                            var error_message = i18n._("This value does not match the password you entered previously.  Please confirm that password.");
                             html += "
    \nThis value does not match the password you entered previously.  Please confirm that password.\n
    \n";
+                                ".$error.awpassmatch'>\n" +
+                                error_message + "\n
    \n";
                         }
                         if (field.awValidUrl) {
+                            var error_message = i18n._("Please enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character.");
                             html += "
    \nPlease enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character.\n
    \n";
+                                ".$error.awvalidurl'>\n" +
+                                error_message + "\n
    \n";
                         }
                         if (field.chkPass && $AnsibleConfig) {
                             // password strength
                             if ($AnsibleConfig.password_length) {
+                                var error_message = i18n.format(i18n._("Your password must be %d characters long."), $AnsibleConfig.password_length);
                                 html += "
    Your password must be " + $AnsibleConfig.password_length + " characters long.
    \n";
+                                    ".$error.password_length\">" +
+                                    error_message  + "
    \n";
                             }
                             if ($AnsibleConfig.password_hasLowercase) {
+                                var error_message = i18n._("Your password must contain a lowercase letter.");
                                 html += "
    Your password must contain a lowercase letter.
    \n";
+                                    ".$error.hasLowercase\">" +
+                                    error_message + "
    \n";
                             }
                             if ($AnsibleConfig.password_hasUppercase) {
+                                var error_message = i18n._("Your password must contain an uppercase letter.");
                                 html += "
    Your password must contain an uppercase letter.
    \n";
+                                    ".$error.hasUppercase\">" +
+                                    error_message + "
    \n";
                             }
                             if ($AnsibleConfig.password_hasNumber) {
+                                var error_message = i18n._("Your password must contain a number.");
                                 html += "
    Your password must contain a number.
    \n";
+                                    ".$error.hasNumber\">" +
+                                    error_message + "
    \n";
                             }
                             if ($AnsibleConfig.password_hasSymbol) {
+                                var error_message = i18n.format(i18n._("Your password must contain one of the following characters: %s"), "`~!@#$%^&*()_-+=|}\]{\[;:\"\'?\/>.<,");
                                 html += "
    Your password must contain one of the following characters: `~!@#$%^&*()_-+=|}\]{\[;:\"\'?\/>.<,
    \n";
+                                    ".$error.hasSymbol\">" +
+                                    error_message + "
    \n";
                             }
                         }
 
@@ -1136,7 +1162,13 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                         if(!field.multiSelect && !field.disableChooseOption){
                             html += "\n";
                         }
 
@@ -1488,10 +1520,14 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                     html += "
    ";
                     html += (options.mode === 'edit') ? this.form.editTitle : this.form.addTitle;
                     if(this.form.name === "user"){
+                        var user_str  = i18n._("Admin");
                         html+= "Admin";
+                            "ng-show='is_superuser'>" +
+                            user_str + "";
+                        user_str  = i18n._("Auditor");
                         html+= "Auditor";
+                            "ng-show='is_system_auditor'>" +
+                            user_str + "";
                         html+= "LDAP";
                         html+= "";
 
                     if(this.mode === "edit"){
                         html += "
    Details
    ";
+                            "ng-class=\"{'is-selected': " + this.form.name + "Selected }\">" +
+                            details + "
    ";
 
                         for (itm in this.form.related) {
                             collection = this.form.related[itm];
@@ -1548,7 +1587,8 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
                     }
                     else if(this.mode === "add"){
                         html += "
    Details
    ";
+                            "class=\"Form-tab is-selected\">" +
+                            details + "
    ";
 
                         for (itm in this.form.related) {
                             collection = this.form.related[itm];
@@ -1693,31 +1733,31 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
 
                                 // Set default color and label for Save and Reset
                                 if (btn === 'save') {
-                                    button.label = 'Save';
+                                    button.label = i18n._('Save');
                                     button['class'] = 'Form-saveButton';
                                 }
                                 if (btn === 'cancel') {
-                                    button.label = 'Cancel';
+                                    button.label = i18n._('Cancel');
                                     button['class'] = 'Form-cancelButton';
                                 }
                                 if (btn === 'close') {
-                                    button.label = 'Close';
+                                    button.label = i18n._('Close');
                                     button['class'] = 'Form-cancelButton';
                                 }
                                 if (btn === 'launch') {
-                                    button.label = 'Launch';
+                                    button.label = i18n._('Launch');
                                     button['class'] = 'Form-launchButton';
                                 }
                                 if (btn === 'add_survey') {
-                                    button.label = 'Add Survey';
+                                    button.label = i18n._('Add Survey');
                                     button['class'] = 'Form-surveyButton';
                                 }
                                 if (btn === 'edit_survey') {
-                                    button.label = 'Edit Survey';
+                                    button.label = i18n._('Edit Survey');
                                     button['class'] = 'Form-surveyButton';
                                 }
                                 if (btn === 'view_survey') {
-                                    button.label = 'View Survey';
+                                    button.label = i18n._('View Survey');
                                     button['class'] = 'Form-surveyButton';
                                 }
 
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index dd7a6beb41..504df42d3b 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -100,8 +100,9 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
 
 export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'PaginateWidget', 'Attr', 'Icon', 'getSearchHtml',
         'Column', 'DropDown', 'NavigationLink', 'SelectIcon', 'ActionButton',
+        'i18n',
     function ($location, $compile, $rootScope, SearchWidget, PaginateWidget, Attr, Icon, getSearchHtml, Column, DropDown, NavigationLink,
-        SelectIcon, ActionButton) {
+        SelectIcon, ActionButton, i18n) {
             return {
 
                 setList: function (list) {
@@ -310,7 +311,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
 
                               if (list.listTitle) {
 
-                                  html += "
    " + list.listTitle + "
    ";
+                                  html += "
    " + list.listTitle + "
    ";
                                   // We want to show the list title badge by default and only hide it when the list config specifically passes a false flag
                                   list.listTitleBadge = (typeof list.listTitleBadge === 'boolean' && list.listTitleBadge === false) ? false : true;
                                   if(list.listTitleBadge) {
@@ -411,7 +412,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
 
                     // Show the "no items" box when loading is done and the user isn't actively searching and there are no results
                     html += "
    ";
-                    html += (list.emptyListText) ? list.emptyListText : "PLEASE ADD ITEMS TO THIS LIST";
+                    html += (list.emptyListText) ? list.emptyListText : i18n._("PLEASE ADD ITEMS TO THIS LIST");
                     html += "
    ";
 
                     // Add a title and optionally a close button (used on Inventory->Groups)
@@ -580,7 +581,9 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
 
                     // Message for loading
                     innerTable += "\n";
-                    innerTable += "\n";
+                    var loading = i18n._("Loading...");
+                    innerTable += "\n";
                     innerTable += "\n";
 
                     // End List
@@ -684,7 +687,7 @@ export default ['$location', '$compile', '$rootScope', 'SearchWidget', 'Paginate
                         html += "\n";
                     }
                     html += "\n";
diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index 056bd09bbf..9828689649 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -169,15 +169,15 @@ export default
                     if(self.socket){
                         if (self.socket.readyState === 0 ) {
                             $rootScope.socketStatus = 'connecting';
-                            $rootScope.socketTip = "Live events: attempting to connect to the Tower server.";
+                            $rootScope.socketTip = i18n._("Live events: attempting to connect to the Tower server.");
                         }
                         else if (self.socket.readyState === 1){
                             $rootScope.socketStatus = 'ok';
-                            $rootScope.socketTip = "Live events: connected. Pages containing job status information will automatically update in real-time.";
+                            $rootScope.socketTip = i18n._("Live events: connected. Pages containing job status information will automatically update in real-time.");
                         }
                         else if (self.socket.readyState === 2 || self.socket.readyState === 3 ){
                             $rootScope.socketStatus = 'error';
-                            $rootScope.socketTip = "Live events: error connecting to the Tower server.";
+                            $rootScope.socketTip = i18n._("Live events: error connecting to the Tower server.");
                         }
                         return;
                     }
diff --git a/awx/ui/grunt-tasks/concurrent.js b/awx/ui/grunt-tasks/concurrent.js
index 1c2efab61f..f9606f0900 100644
--- a/awx/ui/grunt-tasks/concurrent.js
+++ b/awx/ui/grunt-tasks/concurrent.js
@@ -1,9 +1,9 @@
 module.exports = {
     dev: {
-        tasks: ['copy:vendor', 'copy:assets', 'copy:partials', 'copy:config', 'less:dev'],
+        tasks: ['copy:vendor', 'copy:assets', 'copy:partials', 'copy:languages', 'copy:config', 'less:dev'],
     },
     prod: {
-    	tasks: ['newer:copy:vendor', 'newer:copy:assets', 'newer:copy:partials', 'newer:copy:config', 'newer:less:prod']
+    	tasks: ['newer:copy:vendor', 'newer:copy:assets', 'newer:copy:partials', 'newer:copy:languages', 'newer:copy:config', 'newer:less:prod']
     },
     watch: {
         tasks: ['watch:css', 'watch:partials', 'watch:assets', ['webpack:dev', 'watch:config']],
diff --git a/awx/ui/grunt-tasks/copy.js b/awx/ui/grunt-tasks/copy.js
index bbd68021fd..5e32be24b3 100644
--- a/awx/ui/grunt-tasks/copy.js
+++ b/awx/ui/grunt-tasks/copy.js
@@ -43,6 +43,14 @@ module.exports = {
             dest: 'static/partials/'
         }]
     },
+    languages: {
+        files: [{
+            cwd: 'client/',
+            expand: true,
+            src: 'languages/*.json',
+            dest: 'static/'
+        }]
+    },
     config: {
         files: { 'static/config.js': ['client/src/config.js'] }
     }
diff --git a/awx/ui/grunt-tasks/nggettext_compile.js b/awx/ui/grunt-tasks/nggettext_compile.js
new file mode 100644
index 0000000000..c69c159ef7
--- /dev/null
+++ b/awx/ui/grunt-tasks/nggettext_compile.js
@@ -0,0 +1,15 @@
+module.exports = {
+    all: {
+        options: {
+            format: 'json'
+        },
+        files: [ {
+            expand: true,
+            dot:    true,
+            dest:   'client/languages',
+            cwd:    'po',
+            ext:    '.json',
+            src:    ['*.po']
+        } ]
+    }
+};
diff --git a/awx/ui/grunt-tasks/nggettext_extract.js b/awx/ui/grunt-tasks/nggettext_extract.js
new file mode 100644
index 0000000000..3257b384ee
--- /dev/null
+++ b/awx/ui/grunt-tasks/nggettext_extract.js
@@ -0,0 +1,11 @@
+module.exports = {
+    all: {
+        options: {
+            markerNames: ['_', 'N_']
+        },
+        files: {
+            'po/ansible-tower.pot': ['client/src/**/*.js',
+                                     'client/src/**/*.html']
+        }
+    },
+};
diff --git a/awx/ui/package.json b/awx/ui/package.json
index 2aadac00ff..9406e24173 100644
--- a/awx/ui/package.json
+++ b/awx/ui/package.json
@@ -18,6 +18,8 @@
   "scripts": {
     "build-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev",
     "build-docker-cid": "ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt dev",
+    "pot": "grunt nggettext_extract",
+    "languages": "grunt nggettext_compile",
     "build-release": "grunt release",
     "pretest": "grunt clean:coverage",
     "test": "karma start karma.conf.js",
@@ -34,6 +36,7 @@
     "browser-sync": "^2.14.0",
     "expose-loader": "^0.7.1",
     "grunt": "^1.0.1",
+    "grunt-angular-gettext": "^2.2.3",
     "grunt-browser-sync": "^2.2.0",
     "grunt-cli": "^1.2.0",
     "grunt-concurrent": "^2.3.0",
@@ -75,6 +78,7 @@
     "angular-codemirror": "chouseknecht/angular-codemirror#1.0.4",
     "angular-cookies": "^1.4.3",
     "angular-drag-and-drop-lists": "leigh-johnson/angular-drag-and-drop-lists#1.4.0",
+    "angular-gettext": "^2.3.5",
     "angular-md5": "^0.1.8",
     "angular-moment": "^0.10.1",
     "angular-resource": "^1.4.3",
diff --git a/awx/ui/po/ansible-tower.pot b/awx/ui/po/ansible-tower.pot
new file mode 100644
index 0000000000..70b35a0ba9
--- /dev/null
+++ b/awx/ui/po/ansible-tower.pot
@@ -0,0 +1,2041 @@
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Project-Id-Version: \n"
+
+#: client/src/forms/Credentials.js:453
+#: client/src/forms/Inventories.js:108
+#: client/src/forms/Organizations.js:74
+#: client/src/forms/Projects.js:247
+#: client/src/forms/Teams.js:88
+#: client/src/inventory-scripts/inventory-scripts.list.js:45
+#: client/src/lists/Credentials.js:62
+#: client/src/lists/Inventories.js:95
+#: client/src/lists/JobTemplates.js:59
+#: client/src/lists/Projects.js:68
+#: client/src/lists/Teams.js:51
+#: client/src/lists/Users.js:48
+#: client/src/notifications/notificationTemplates.list.js:52
+msgid "+ ADD"
+msgstr ""
+
+#: client/src/notifications/notifications.list.js:68
+msgid "+ ADD NOTIFICATION TEMPLATE"
+msgstr ""
+
+#: client/src/organizations/list/organizations-list.partial.html:15
+msgid "+ ADD"
+msgstr ""
+
+#: client/src/controllers/Projects.js:779
+msgid ". GET status:"
+msgstr ""
+
+#: client/src/controllers/Projects.js:270
+msgid "
    Are you sure you want to delete the project below?
    "
+msgstr ""
+
+#: client/src/controllers/Projects.js:881
+msgid "
    Are you sure you want to remove the %s below from %s?
    "
+msgstr ""
+
+#: client/src/controllers/Projects.js:328
+msgid "
    An SCM update does not appear to be running for project: %s. Click the Refresh button to view the latest status.
    "
+msgstr ""
+
+#: client/src/controllers/Projects.js:304
+msgid "
    Either you do not have access or the SCM update process completed. Click the Refresh button to view the latest status.
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:127
+msgid "
    Security Token Service (STS) is a web service that enables you to request temporary, limited-privilege credentials for AWS Identity and Access Management (IAM) users.
    To learn more about the IAM STS Token, refer to the Amazon documentation.
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:69
+msgid ""
+"
    \n"
+"
    Machine
    \n"
+"
    Authentication for remote machine access. This can include SSH keys, usernames, passwords, and sudo information. Machine credentials are used when submitting jobs to run playbooks against remote hosts.
    Network
    \n"
+"
    Authentication for network device access. This can include SSH keys, usernames, passwords, and authorize information. Network credentials are used when submitting jobs to run playbooks against network devices.
    Source Control
    \n"
+"
    Used to check out and synchronize playbook repositories with a remote source control management system such as Git, Subversion (svn), or Mercurial (hg). These credentials are used by Projects.
    \n"
+"
    Others (Cloud Providers)
    \n"
+"
    Usernames, passwords, and access keys for authenticating to the specified cloud or infrastructure provider. These are used for dynamic inventory sources and for cloud provisioning and deployment in playbook runs.
    \n"
+"
    "
+msgstr ""
+
+#: client/src/controllers/Projects.js:550
+#: client/src/controllers/Projects.js:918
+msgid "
     URL popover text"
+msgstr ""
+
+#: client/src/forms/Projects.js:85
+msgid "
    Base path used for locating playbooks. Directories found inside this path will be listed in the playbook directory drop-down. Together the base path and selected playbook directory provide the full path used to locate playbooks.
    Use PROJECTS_ROOT in your environment settings file to determine the base path value.
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:295
+msgid "
    Color can be one of yellow, green, red, purple, gray, or random."
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:228
+msgid "
    Control the level of output ansible will produce as the playbook executes.
    "
+msgstr ""
+
+#: client/src/forms/Projects.js:172
+msgid "
    Delete the local repository in its entirety prior to performing an update.
    Depending on the size of the repository this may significantly increase the amount of time required to complete an update.
    "
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.form.js:59
+msgid "
    Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. 

     Script must begin with a hashbang sequence: i.e.... #!/usr/bin/env python
    "
+msgstr ""
+
+#: client/src/forms/Projects.js:185
+msgid "
    Each time a job runs using this project, perform an update to the local repository prior to starting the job.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:298
+msgid "
    Enables creation of a provisioning callback URL. Using the URL a host can contact Tower and request a configuration update using this job template.
    "
+msgstr ""
+
+#: client/src/forms/Inventories.js:61
+msgid ""
+"
    Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.
    JSON:
    \n"
+"
    {
     \"somevar\": \"somevalue\",
     \"password\": \"magic\"
     }
    \n"
+"YAML:
    \n"
+"
    ---
    somevar: somevalue
    password: magic
    \n"
+"
    View JSON examples at www.json.org
    View YAML examples at docs.ansible.com
    "
+msgstr ""
+
+#: client/src/controllers/Projects.js:530
+#: client/src/controllers/Projects.js:898
+msgid "
    Example URLs for GIT SCM include:
    • https://github.com/ansible/ansible.git
    • git@github.com:ansible/ansible.git
    • git://servername.example.com/ansible.git
    Note: When using SSH protocol for GitHub or Bitbucket, enter an SSH key only, do not enter a username (other than git). Additionally, GitHub and Bitbucket do not support password authentication when using SSH. GIT read only protocol (git://) does not use username or password information."
+msgstr ""
+
+#: client/src/controllers/Projects.js:542
+#: client/src/controllers/Projects.js:910
+msgid "
    Example URLs for Mercurial SCM include:
    • https://bitbucket.org/username/project
    • ssh://hg@bitbucket.org/username/project
    • ssh://server.example.com/path
    Note: Mercurial does not support password authentication for SSH. Do not put the username and key in the URL. If using Bitbucket and SSH, do not supply your Bitbucket username."
+msgstr ""
+
+#: client/src/controllers/Projects.js:537
+#: client/src/controllers/Projects.js:905
+msgid "
    Example URLs for Subversion SCM include:
    • https://github.com/ansible/ansible
    • svn://servername.example.com/path
    • svn+ssh://servername.example.com/path
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:284
+msgid "
    If enabled, run this playbook as an administrator. This is the equivalent of passing the --become option to the ansible-playbook command. 
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:55
+msgid "
    If no organization is given, the credential can only be used by the user that creates the credential.  Organization admins and system administrators can assign an organization so that roles for the credential can be assigned to users and teams in that organization.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:176
+msgid "
    Network credentials are used by Ansible networking modules to connect to and manage networking devices.
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:198
+msgid "
    Number associated with the \"Messaging Service\" in Twilio.
    This must be of the form +18005550199.
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:386
+msgid "
    OpenStack domains define administrative boundaries. It is only needed for Keystone v3 authentication URLs. Common scenarios include:
    • v2 URLs - leave blank
    • v3 default - set to 'default'
    • v3 multi-domain - your domain name
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:346
+msgid "
    Optional labels that describe this job template, such as 'dev' or 'test'. Labels can be used to group and filter job templates and completed jobs in the Tower display.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:359
+msgid ""
+"
    Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON.
    JSON:
    \n"
+"
    {
     \"somevar\": \"somevalue\",
     \"password\": \"magic\"
     }
    \n"
+"YAML:
    \n"
+"
    ---
    somevar: somevalue
    password: magic
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:262
+msgid ""
+"
    Provide a comma separated list of tags.
    \n"
+"
    Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task.
    Consult the Ansible documentation for further details on the usage of tags.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:242
+msgid ""
+"
    Provide a comma separated list of tags.
    \n"
+"
    Tags are useful when you have a large playbook, and you want to run a specific part of a play or task.
    Consult the Ansible documentation for further details on the usage of tags.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:208
+msgid "
    Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. Multiple patterns can be separated by ; : or ,
    For more information and examples see the Patterns topic at docs.ansible.com.
    "
+msgstr ""
+
+#: client/src/forms/Projects.js:160
+msgid "
    Remove any local modifications prior to performing an update.
    "
+msgstr ""
+
+#: client/src/forms/Projects.js:103
+msgid "
    Select from the list of directories found in the base path.Together the base path and the playbook directory provide the full path used to locate playbooks.
    Use PROJECTS_ROOT in your environment settings file to determine the base path value.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:140
+msgid "
    Select the credential you want the job to use when accessing the remote hosts. Choose the credential containing  the username and SSH key or password that Ansible will need to log into the remote hosts.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:78
+msgid "
    Select the inventory containing the hosts you want this job to manage.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:122
+msgid "
    Select the playbook to be executed by this job.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:105
+msgid "
    Select the project containing the playbook you want this job to execute.
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:160
+msgid "
    Selecting an optional cloud credential in the job template will pass along the access credentials to the running playbook, allowing provisioning into the cloud without manually passing parameters to the included modules.
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:332
+msgid ""
+"
    Specify HTTP Headers in JSON format
    For example:
    \n"
+"{\n"
+"  \"X-Auth-Token\": \"828jf0\",\n"
+"  \"X-Ansible\": \"Is great!\"\n"
+"}\n"
+"
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:290
+msgid "
    Specify a method for 'become' operations. This is equivalent to specifying the --become-method=BECOME_METHOD parameter, where BECOME_METHOD could be sudo | su | pbrun | pfexec | runas 
    (defaults to sudo)
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:163
+msgid "
    Subscription ID is an Azure construct, which is mapped to a username.
    "
+msgstr ""
+
+#: client/src/helpers/Credentials.js:105
+msgid "
    The Project ID is the GCE assigned identification. It is constructed as two words followed by a three digit number.  Such as: 
    adjective-noun-000
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:192
+msgid "
    The email address assigned to the Google Compute Engine service account.
    "
+msgstr ""
+
+#: client/src/helpers/Credentials.js:141
+msgid "
    The host to authenticate with.
    For example, https://openstack.business.com/v2.0/"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:75
+msgid "
    The host value
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:194
+msgid "
    The number of parallel or simultaneous processes to use while executing the playbook. 0 signifies the default value from the ansible configuration file.
    "
+msgstr ""
+
+#: client/src/helpers/Credentials.js:74
+msgid "
    The project value
    "
+msgstr ""
+
+#: client/src/helpers/Credentials.js:138
+msgid "
    This is the tenant name.  This value is usually the same  as the username.
    "
+msgstr ""
+
+#: client/src/forms/Projects.js:204
+msgid "
    Time in seconds to consider a project to be current. During job runs and callbacks the task system will evaluate the timestamp of the latest project update. If it is older than Cache Timeout, it is not considered current, and a new project update will be performed.
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:370
+msgid ""
+"
    Type an option on each line. The pound symbol (#) is not required.
    For example:
    #support or support
    \n"
+" @username or username
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:141
+#: client/src/notifications/notificationTemplates.form.js:158
+msgid ""
+"
    Type an option on each line. The pound symbol (#) is not required.
    For example:
    engineering
    \n"
+" #support
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:212
+msgid ""
+"
    Type an option on each line.
    For example:
    +12125552368
    \n"
+"+19105556162
    "
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:97
+msgid ""
+"
    Type an option on each line.
    For example:
    alias1@email.com
    \n"
+" alias2@email.com
    "
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:52
+msgid "
    When this template is submitted as a job, setting the type to run will execute the playbook, running tasks  on the selected hosts.
    Setting the type to check will not execute the playbook. Instead, ansible will check playbook  syntax, test environment setup and report problems.
    Setting the type to scan will execute the playbook and store any  scanned facts for use with Tower's System Tracking feature.
    "
+msgstr ""
+
+#: client/src/forms/Credentials.js:200
+msgid "API Key"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:248
+msgid "API Service/Integration Key"
+msgstr ""
+
+#: client/src/notifications/shared/type-change.service.js:52
+msgid "API Token"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:53
+msgid "About Tower"
+msgstr ""
+
+#: client/src/forms/Credentials.js:94
+msgid "Access Key"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:226
+msgid "Account SID"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:184
+msgid "Account Token"
+msgstr ""
+
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:20
+#: client/src/shared/list-generator/list-generator.factory.js:690
+msgid "Actions"
+msgstr ""
+
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:17
+#: client/src/lists/JobTemplates.js:34
+msgid "Activity"
+msgstr ""
+
+#: client/src/lists/Credentials.js:17
+msgid "Add Credentials"
+msgstr ""
+
+#: client/src/dashboard/hosts/dashboard-hosts.list.js:12
+msgid "Add Existing Hosts"
+msgstr ""
+
+#: client/src/lists/Inventories.js:15
+msgid "Add Inventories"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:15
+msgid "Add Job Template"
+msgstr ""
+
+#: client/src/lists/Projects.js:14
+msgid "Add Project"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1752
+msgid "Add Survey"
+msgstr ""
+
+#: client/src/lists/Teams.js:15
+msgid "Add Team"
+msgstr ""
+
+#: client/src/lists/Users.js:15
+msgid "Add Users"
+msgstr ""
+
+#: client/src/forms/Credentials.js:451
+#: client/src/forms/Inventories.js:106
+#: client/src/forms/Organizations.js:72
+#: client/src/forms/Projects.js:245
+msgid "Add a permission"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:23
+msgid "Add passwords, SSH keys, etc. for Tower to use when launching jobs against machines, or when syncing inventories or projects."
+msgstr ""
+
+#: client/src/forms/Teams.js:86
+msgid "Add user to team"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1523
+msgid "Admin"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:37
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:43
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:65
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:74
+msgid "All"
+msgstr ""
+
+#: client/src/portal-mode/portal-mode-jobs.partial.html:7
+msgid "All Jobs"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:292
+#: client/src/forms/JobTemplates.js:301
+msgid "Allow Provisioning Callbacks"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:11
+msgid "Allow others to sign into Tower and own the content they create."
+msgstr ""
+
+#: client/src/forms/Credentials.js:236
+#: client/src/forms/Credentials.js:276
+#: client/src/forms/Credentials.js:317
+#: client/src/forms/Credentials.js:408
+msgid "Ask at runtime?"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1527
+msgid "Auditor"
+msgstr ""
+
+#: client/src/forms/Credentials.js:348
+msgid "Authorize"
+msgstr ""
+
+#: client/src/forms/Credentials.js:356
+msgid "Authorize Password"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:286
+msgid "Become Privilege Escalation"
+msgstr ""
+
+#: client/src/license/license.partial.html:104
+msgid "Browse"
+msgstr ""
+
+#: client/src/app.js:441
+msgid "CREATE CREDENTIAL"
+msgstr ""
+
+#: client/src/job-templates/add/job-templates-add.route.js:17
+msgid "CREATE JOB TEMPLATE"
+msgstr ""
+
+#: client/src/app.js:307
+msgid "CREATE PROJECT"
+msgstr ""
+
+#: client/src/app.js:356
+msgid "CREATE TEAM"
+msgstr ""
+
+#: client/src/app.js:478
+msgid "CREATE USER"
+msgstr ""
+
+#: client/src/app.js:431
+msgid "CREDENTIALS"
+msgstr ""
+
+#: client/src/forms/Projects.js:207
+msgid "Cache Timeout"
+msgstr ""
+
+#: client/src/forms/Projects.js:194
+msgid "Cache Timeout (seconds)"
+msgstr ""
+
+#: client/src/controllers/Projects.js:264
+msgid "Call to %s failed. DELETE returned status:"
+msgstr ""
+
+#: client/src/controllers/Projects.js:309
+#: client/src/controllers/Projects.js:325
+msgid "Call to %s failed. GET status:"
+msgstr ""
+
+#: client/src/controllers/Projects.js:288
+msgid "Call to %s failed. POST status:"
+msgstr ""
+
+#: client/src/controllers/Projects.js:334
+msgid "Call to get project failed. GET status:"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1740
+msgid "Cancel"
+msgstr ""
+
+#: client/src/controllers/Projects.js:304
+msgid "Cancel Not Allowed"
+msgstr ""
+
+#: client/src/lists/Projects.js:122
+msgid "Cancel the SCM update"
+msgstr ""
+
+#: client/src/controllers/Projects.js:66
+msgid "Canceled. Click for details"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1169
+msgid "Choose a %s"
+msgstr ""
+
+#: client/src/license/license.partial.html:97
+msgid "Choose your license file, agree to the End User License Agreement, and click submit."
+msgstr ""
+
+#: client/src/forms/Projects.js:156
+msgid "Clean"
+msgstr ""
+
+#: client/src/forms/Credentials.js:326
+msgid "Client ID"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:259
+msgid "Client Identifier"
+msgstr ""
+
+#: client/src/forms/Credentials.js:335
+msgid "Client Secret"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1744
+msgid "Close"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:152
+#: client/src/forms/JobTemplates.js:162
+msgid "Cloud Credential"
+msgstr ""
+
+#: client/src/lists/Inventories.js:62
+msgid "Cloud sourced?"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:158
+msgid "CloudForms Host"
+msgstr ""
+
+#: client/src/lists/CompletedJobs.js:18
+msgid "Completed Jobs"
+msgstr ""
+
+#: client/src/management-jobs/card/card.partial.html:32
+msgid "Configure Notifications"
+msgstr ""
+
+#: client/src/forms/Users.js:87
+msgid "Confirm Password"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:85
+msgid "Copy"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:88
+msgid "Copy template"
+msgstr ""
+
+#: client/src/forms/Credentials.js:18
+msgid "Create Credential"
+msgstr ""
+
+#: client/src/lists/Credentials.js:60
+msgid "Create a new credential"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:43
+#: client/src/notifications/notificationTemplates.list.js:50
+msgid "Create a new custom inventory"
+msgstr ""
+
+#: client/src/lists/Inventories.js:93
+msgid "Create a new inventory"
+msgstr ""
+
+#: client/src/notifications/notifications.list.js:66
+msgid "Create a new notification template"
+msgstr ""
+
+#: client/src/organizations/list/organizations-list.partial.html:16
+msgid "Create a new organization"
+msgstr ""
+
+#: client/src/lists/Projects.js:66
+msgid "Create a new project"
+msgstr ""
+
+#: client/src/lists/Teams.js:49
+msgid "Create a new team"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:57
+msgid "Create a new template"
+msgstr ""
+
+#: client/src/lists/Users.js:46
+msgid "Create a new user"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:35
+msgid "Create and edit scripts to dynamically load hosts from any source."
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:42
+msgid "Create templates for sending notifications with Email, HipChat, Slack, and SMS."
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:142
+msgid "Credential"
+msgstr ""
+
+#: client/src/lists/Credentials.js:18
+#: client/src/lists/Credentials.js:19
+#: client/src/setup-menu/setup-menu.partial.html:22
+msgid "Credentials"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.form.js:50
+#: client/src/inventory-scripts/inventory-scripts.form.js:61
+msgid "Custom Script"
+msgstr ""
+
+#: client/src/app.js:264
+msgid "DASHBOARD"
+msgstr ""
+
+#: client/src/controllers/Projects.js:269
+#: client/src/controllers/Projects.js:880
+#: client/src/inventory-scripts/inventory-scripts.list.js:74
+#: client/src/lists/Credentials.js:92
+#: client/src/lists/Inventories.js:119
+#: client/src/lists/JobTemplates.js:109
+#: client/src/lists/Teams.js:78
+#: client/src/lists/Users.js:77
+#: client/src/notifications/notificationTemplates.list.js:89
+msgid "Delete"
+msgstr ""
+
+#: client/src/lists/Credentials.js:94
+msgid "Delete credential"
+msgstr ""
+
+#: client/src/lists/Inventories.js:121
+msgid "Delete inventory"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:76
+msgid "Delete inventory script"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.list.js:91
+msgid "Delete notification"
+msgstr ""
+
+#: client/src/forms/Projects.js:168
+msgid "Delete on Update"
+msgstr ""
+
+#: client/src/lists/Teams.js:82
+msgid "Delete team"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:112
+msgid "Delete template"
+msgstr ""
+
+#: client/src/lists/Projects.js:116
+msgid "Delete the project"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:95
+msgid "Delete the schedule"
+msgstr ""
+
+#: client/src/lists/Users.js:81
+msgid "Delete user"
+msgstr ""
+
+#: client/src/forms/Credentials.js:40
+#: client/src/forms/Inventories.js:35
+#: client/src/forms/JobTemplates.js:36
+#: client/src/forms/Organizations.js:33
+#: client/src/forms/Projects.js:38
+#: client/src/forms/Teams.js:33
+#: client/src/inventory-scripts/inventory-scripts.form.js:31
+#: client/src/inventory-scripts/inventory-scripts.list.js:25
+#: client/src/lists/Credentials.js:34
+#: client/src/lists/JobTemplates.js:30
+#: client/src/lists/PortalJobTemplates.js:30
+#: client/src/lists/Teams.js:31
+#: client/src/notifications/notificationTemplates.form.js:34
+msgid "Description"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:138
+#: client/src/notifications/notificationTemplates.form.js:143
+#: client/src/notifications/notificationTemplates.form.js:155
+#: client/src/notifications/notificationTemplates.form.js:160
+#: client/src/notifications/notificationTemplates.form.js:372
+msgid "Destination Channels"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:367
+msgid "Destination Channels or Users"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:209
+#: client/src/notifications/notificationTemplates.form.js:214
+msgid "Destination SMS Number"
+msgstr ""
+
+#: client/src/license/license.partial.html:5
+#: client/src/shared/form-generator.js:1561
+msgid "Details"
+msgstr ""
+
+#: client/src/forms/Teams.js:145
+msgid "Dissasociate permission from team"
+msgstr ""
+
+#: client/src/forms/Users.js:204
+msgid "Dissasociate permission from user"
+msgstr ""
+
+#: client/src/forms/Credentials.js:391
+#: client/src/helpers/Credentials.js:133
+msgid "Domain Name"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:57
+#: client/src/lists/Credentials.js:73
+#: client/src/lists/Inventories.js:105
+#: client/src/lists/JobTemplates.js:93
+#: client/src/lists/Teams.js:61
+#: client/src/lists/Users.js:58
+#: client/src/notifications/notificationTemplates.list.js:63
+#: client/src/notifications/notificationTemplates.list.js:72
+msgid "Edit"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1756
+msgid "Edit Survey"
+msgstr ""
+
+#: client/src/lists/Credentials.js:75
+msgid "Edit credential"
+msgstr ""
+
+#: client/src/lists/Inventories.js:107
+msgid "Edit inventory"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:59
+msgid "Edit inventory script"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.list.js:74
+msgid "Edit notification"
+msgstr ""
+
+#: client/src/lists/Teams.js:65
+msgid "Edit team"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:95
+msgid "Edit template"
+msgstr ""
+
+#: client/src/lists/Projects.js:103
+msgid "Edit the project"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:81
+msgid "Edit the schedule"
+msgstr ""
+
+#: client/src/lists/Users.js:62
+msgid "Edit user"
+msgstr ""
+
+#: client/src/forms/Credentials.js:193
+#: client/src/forms/Users.js:42
+msgid "Email"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:279
+msgid "Enable Privilege Escalation"
+msgstr ""
+
+#: client/src/license/license.partial.html:108
+msgid "End User License Agreement"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:159
+msgid "Enter the hostname or IP address for the virtual 
     machine which is hosting the CloudForm appliance."
+msgstr ""
+
+#: client/src/helpers/Credentials.js:150
+msgid "Enter the hostname or IP address name which 
    corresponds to your Red Hat Satellite 6 server."
+msgstr ""
+
+#: client/src/helpers/Credentials.js:128
+msgid "Enter the hostname or IP address which corresponds to your VMware vCenter."
+msgstr ""
+
+#: client/src/controllers/Projects.js:242
+#: client/src/controllers/Projects.js:263
+#: client/src/controllers/Projects.js:288
+#: client/src/controllers/Projects.js:309
+#: client/src/controllers/Projects.js:324
+#: client/src/controllers/Projects.js:333
+#: client/src/controllers/Projects.js:513
+#: client/src/controllers/Projects.js:778
+msgid "Error!"
+msgstr ""
+
+#: client/src/license/license.partial.html:39
+msgid "Expires On"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:351
+#: client/src/forms/JobTemplates.js:365
+msgid "Extra Variables"
+msgstr ""
+
+#: client/src/dashboard/graphs/job-status/job-status-graph.directive.js:67
+msgid "FAILED"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:80
+msgid "Failed"
+msgstr ""
+
+#: client/src/dashboard/counts/dashboard-counts.directive.js:44
+msgid "Failed Hosts"
+msgstr ""
+
+#: client/src/lists/Inventories.js:69
+msgid "Failed hosts?"
+msgstr ""
+
+#: client/src/controllers/Projects.js:514
+msgid "Failed to create new project. POST returned status:"
+msgstr ""
+
+#: client/src/controllers/Projects.js:779
+msgid "Failed to retrieve project:"
+msgstr ""
+
+#: client/src/notifications/notifications.list.js:49
+msgid "Failure"
+msgstr ""
+
+#: client/src/lists/CompletedJobs.js:72
+#: client/src/lists/PortalJobs.js:43
+msgid "Finished"
+msgstr ""
+
+#: client/src/forms/Users.js:26
+#: client/src/lists/Users.js:31
+msgid "First Name"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:183
+#: client/src/forms/JobTemplates.js:197
+msgid "Forks"
+msgstr ""
+
+#: client/src/forms/Teams.js:115
+msgid "Granted Permissions"
+msgstr ""
+
+#: client/src/forms/Users.js:176
+msgid "Granted permissions"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:5
+msgid "Group all of your content to manage permissions across departments in your company."
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:324
+msgid "HTTP Headers"
+msgstr ""
+
+#: client/src/forms/Credentials.js:141
+#: client/src/notifications/notificationTemplates.form.js:72
+msgid "Host"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:131
+msgid "Host (Authentication URL)"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:323
+#: client/src/forms/JobTemplates.js:332
+msgid "Host Config Key"
+msgstr ""
+
+#: client/src/dashboard/counts/dashboard-counts.directive.js:39
+msgid "Hosts"
+msgstr ""
+
+#: client/src/license/license.partial.html:52
+msgid "Hosts Available"
+msgstr ""
+
+#: client/src/license/license.partial.html:64
+msgid "Hosts Remaining"
+msgstr ""
+
+#: client/src/license/license.partial.html:58
+msgid "Hosts Used"
+msgstr ""
+
+#: client/src/license/license.partial.html:116
+msgid "I agree to the End User License Agreement"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:104
+#: client/src/main-menu/main-menu.partial.html:27
+msgid "INVENTORIES"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:356
+msgid "IRC Nick"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:345
+msgid "IRC Server Address"
+msgstr ""
+
+#: client/src/notifications/shared/type-change.service.js:58
+msgid "IRC Server Password"
+msgstr ""
+
+#: client/src/notifications/shared/type-change.service.js:57
+msgid "IRC Server Port"
+msgstr ""
+
+#: client/src/license/license.partial.html:70
+msgid "If you are ready to upgrade, please contact us by clicking the button below"
+msgstr ""
+
+#: client/src/license/license.partial.html:11
+msgid "Invalid License"
+msgstr ""
+
+#: client/src/dashboard/counts/dashboard-counts.directive.js:50
+#: client/src/lists/Inventories.js:16
+#: client/src/lists/Inventories.js:17
+msgid "Inventories"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:67
+#: client/src/forms/JobTemplates.js:79
+msgid "Inventory"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:12
+#: client/src/setup-menu/setup-menu.partial.html:34
+msgid "Inventory Scripts"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:46
+#: client/src/lists/ScheduledJobs.js:56
+msgid "Inventory Sync"
+msgstr ""
+
+#: client/src/dashboard/counts/dashboard-counts.directive.js:55
+msgid "Inventory Sync Failures"
+msgstr ""
+
+#: client/src/forms/Inventories.js:68
+msgid "Inventory Variables"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:4
+msgid "JOB STATUS"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:113
+#: client/src/main-menu/main-menu.partial.html:35
+msgid "JOB TEMPLATES"
+msgstr ""
+
+#: client/src/app.js:284
+#: client/src/dashboard/graphs/job-status/job-status-graph.directive.js:113
+#: client/src/main-menu/main-menu.partial.html:122
+#: client/src/main-menu/main-menu.partial.html:43
+msgid "JOBS"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:235
+#: client/src/forms/JobTemplates.js:245
+msgid "Job Tags"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:16
+#: client/src/lists/JobTemplates.js:17
+#: client/src/lists/PortalJobTemplates.js:15
+#: client/src/lists/PortalJobTemplates.js:16
+msgid "Job Templates"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:32
+#: client/src/forms/JobTemplates.js:44
+#: client/src/forms/JobTemplates.js:56
+msgid "Job Type"
+msgstr ""
+
+#: client/src/lists/CompletedJobs.js:81
+msgid "Job failed?"
+msgstr ""
+
+#: client/src/lists/PortalJobs.js:15
+#: client/src/lists/PortalJobs.js:19
+#: client/src/partials/jobs.html:10
+msgid "Jobs"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:83
+msgid "LOG OUT"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:270
+msgid "Label to be shown with notification"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:337
+#: client/src/forms/JobTemplates.js:344
+#: client/src/lists/JobTemplates.js:42
+msgid "Labels"
+msgstr ""
+
+#: client/src/forms/Users.js:34
+#: client/src/lists/Users.js:35
+msgid "Last Name"
+msgstr ""
+
+#: client/src/lists/Projects.js:53
+msgid "Last Updated"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:69
+#: client/src/lists/PortalJobTemplates.js:40
+#: client/src/shared/form-generator.js:1748
+msgid "Launch"
+msgstr ""
+
+#: client/src/management-jobs/card/card.partial.html:21
+msgid "Launch Management Job"
+msgstr ""
+
+#: client/src/license/license.controller.js:97
+#: client/src/license/license.partial.html:8
+msgid "License"
+msgstr ""
+
+#: client/src/license/license.partial.html:102
+msgid "License File"
+msgstr ""
+
+#: client/src/license/license.partial.html:33
+msgid "License Key"
+msgstr ""
+
+#: client/src/license/license.controller.js:97
+msgid "License Management"
+msgstr ""
+
+#: client/src/license/license.partial.html:21
+msgid "License Type"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:203
+#: client/src/forms/JobTemplates.js:211
+msgid "Limit"
+msgstr ""
+
+#: client/src/shared/Socket.js:59
+msgid "Live events: attempting to connect to the Tower server."
+msgstr ""
+
+#: client/src/shared/Socket.js:62
+msgid "Live events: connected. Pages containing job status information will automatically update in real-time."
+msgstr ""
+
+#: client/src/shared/Socket.js:56
+msgid "Live events: error connecting to the Tower server."
+msgstr ""
+
+#: client/src/shared/list-generator/list-generator.factory.js:584
+msgid "Loading..."
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:188
+msgid "Log Out"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:129
+msgid "Machine Credential"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:29
+msgid "Manage the cleanup of old job history, activity streams, data marked for deletion, and system tracking info."
+msgstr ""
+
+#: client/src/helpers/Credentials.js:111
+msgid "Management Certificate"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:59
+msgid "Management Job"
+msgstr ""
+
+#: client/src/management-jobs/card/card.partial.html:4
+#: client/src/setup-menu/setup-menu.partial.html:28
+msgid "Management Jobs"
+msgstr ""
+
+#: client/src/controllers/Projects.js:79
+msgid "Manual projects do not require a schedule"
+msgstr ""
+
+#: client/src/controllers/Projects.js:78
+msgid "Manual projects do not require an SCM update"
+msgstr ""
+
+#: client/src/portal-mode/portal-mode-jobs.partial.html:4
+msgid "My Jobs"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:160
+msgid "My View"
+msgstr ""
+
+#: client/src/dashboard/hosts/dashboard-hosts.list.js:18
+msgid "NO HOSTS FOUND"
+msgstr ""
+
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:14
+#: client/src/dashboard/lists/jobs/jobs-list.partial.html:13
+#: client/src/forms/Credentials.js:32
+#: client/src/forms/Inventories.js:26
+#: client/src/forms/JobTemplates.js:28
+#: client/src/forms/Organizations.js:25
+#: client/src/forms/Projects.js:30
+#: client/src/forms/Teams.js:123
+#: client/src/forms/Teams.js:25
+#: client/src/forms/Users.js:183
+#: client/src/inventory-scripts/inventory-scripts.form.js:23
+#: client/src/inventory-scripts/inventory-scripts.list.js:20
+#: client/src/lists/CompletedJobs.js:55
+#: client/src/lists/Credentials.js:29
+#: client/src/lists/Inventories.js:47
+#: client/src/lists/JobTemplates.js:26
+#: client/src/lists/PortalJobTemplates.js:24
+#: client/src/lists/PortalJobs.js:36
+#: client/src/lists/Projects.js:41
+#: client/src/lists/ScheduledJobs.js:33
+#: client/src/lists/Teams.js:26
+#: client/src/notifications/notificationTemplates.form.js:26
+#: client/src/notifications/notificationTemplates.list.js:33
+#: client/src/notifications/notifications.list.js:26
+msgid "Name"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:168
+#: client/src/forms/JobTemplates.js:177
+msgid "Network Credential"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.form.js:16
+msgid "New Custom Inventory"
+msgstr ""
+
+#: client/src/forms/Inventories.js:18
+msgid "New Inventory"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:20
+msgid "New Job Template"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:16
+msgid "New Notification Template"
+msgstr ""
+
+#: client/src/forms/Organizations.js:18
+msgid "New Organization"
+msgstr ""
+
+#: client/src/forms/Projects.js:18
+msgid "New Project"
+msgstr ""
+
+#: client/src/forms/Teams.js:18
+msgid "New Team"
+msgstr ""
+
+#: client/src/forms/Users.js:18
+msgid "New User"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:64
+msgid "Next Run"
+msgstr ""
+
+#: client/src/lists/Inventories.js:82
+msgid "No"
+msgstr ""
+
+#: client/src/lists/Credentials.js:24
+msgid "No Credentials Have Been Created"
+msgstr ""
+
+#: client/src/controllers/Projects.js:232
+msgid "No SCM Configuration"
+msgstr ""
+
+#: client/src/controllers/Projects.js:223
+msgid "No Updates Available"
+msgstr ""
+
+#: client/src/lists/CompletedJobs.js:22
+msgid "No completed jobs"
+msgstr ""
+
+#: client/src/license/license.controller.js:96
+msgid "No file selected."
+msgstr ""
+
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:56
+msgid ""
+"No job templates were recently used.
    \n"
+"        You can create a job template here."
+msgstr ""
+
+#: client/src/dashboard/lists/jobs/jobs-list.partial.html:46
+msgid "No jobs were recently run."
+msgstr ""
+
+#: client/src/forms/Teams.js:120
+#: client/src/forms/Users.js:180
+msgid "No permissions have been granted"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:18
+msgid "No schedules exist"
+msgstr ""
+
+#: client/src/controllers/Users.js:16
+msgid "Normal User"
+msgstr ""
+
+#: client/src/controllers/Projects.js:81
+msgid "Not configured for SCM"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:293
+msgid "Notification Color"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.list.js:14
+msgid "Notification Templates"
+msgstr ""
+
+#: client/src/notifications/notifications.list.js:17
+#: client/src/setup-menu/setup-menu.partial.html:41
+msgid "Notifications"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:306
+msgid "Notify Channel"
+msgstr ""
+
+#: client/src/organizations/list/organizations-list.partial.html:6
+msgid "ORGANIZATIONS"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:275
+#: client/src/notifications/notificationTemplates.form.js:391
+msgid "Options"
+msgstr ""
+
+#: client/src/forms/Credentials.js:50
+#: client/src/forms/Credentials.js:56
+#: client/src/forms/Inventories.js:42
+#: client/src/forms/Projects.js:45
+#: client/src/forms/Projects.js:54
+#: client/src/forms/Teams.js:40
+#: client/src/forms/Users.js:60
+#: client/src/inventory-scripts/inventory-scripts.form.js:38
+#: client/src/inventory-scripts/inventory-scripts.list.js:30
+#: client/src/lists/Inventories.js:53
+#: client/src/lists/Teams.js:36
+#: client/src/notifications/notificationTemplates.form.js:41
+msgid "Organization"
+msgstr ""
+
+#: client/src/forms/Users.js:131
+#: client/src/setup-menu/setup-menu.partial.html:4
+msgid "Organizations"
+msgstr ""
+
+#: client/src/lists/Credentials.js:47
+msgid "Owners"
+msgstr ""
+
+#: client/src/login/loginModal/loginModal.partial.html:64
+msgid "PASSWORD"
+msgstr ""
+
+#: client/src/organizations/list/organizations-list.partial.html:26
+#: client/src/shared/list-generator/list-generator.factory.js:415
+msgid "PLEASE ADD ITEMS TO THIS LIST"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:67
+msgid "PORTAL MODE"
+msgstr ""
+
+#: client/src/app.js:297
+#: client/src/main-menu/main-menu.partial.html:19
+#: client/src/main-menu/main-menu.partial.html:95
+msgid "PROJECTS"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:237
+msgid "Pagerduty subdomain"
+msgstr ""
+
+#: client/src/forms/Credentials.js:228
+#: client/src/forms/Users.js:75
+#: client/src/helpers/Credentials.js:119
+#: client/src/helpers/Credentials.js:127
+#: client/src/helpers/Credentials.js:147
+#: client/src/helpers/Credentials.js:156
+#: client/src/helpers/Credentials.js:165
+#: client/src/helpers/Credentials.js:45
+#: client/src/helpers/Credentials.js:94
+#: client/src/notifications/shared/type-change.service.js:28
+msgid "Password"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:73
+msgid "Password (API Key)"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:20
+msgid "Past 24 Hours"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:15
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:26
+msgid "Past Month"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:23
+msgid "Past Week"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:102
+msgid "Paste the contents of the PEM file associated with the service account email."
+msgstr ""
+
+#: client/src/helpers/Credentials.js:114
+msgid "Paste the contents of the PEM file that corresponds to the certificate you uploaded in the Microsoft Azure console."
+msgstr ""
+
+#: client/src/helpers/Credentials.js:66
+msgid "Paste the contents of the SSH private key file."
+msgstr ""
+
+#: client/src/helpers/Credentials.js:41
+msgid "Paste the contents of the SSH private key file.
    esc or click to close
    "
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:8
+msgid "Period"
+msgstr ""
+
+#: client/src/forms/Credentials.js:442
+#: client/src/forms/Inventories.js:97
+#: client/src/forms/JobTemplates.js:418
+#: client/src/forms/Organizations.js:63
+#: client/src/forms/Projects.js:236
+msgid "Permissions"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:112
+#: client/src/forms/JobTemplates.js:123
+msgid "Playbook"
+msgstr ""
+
+#: client/src/forms/Projects.js:94
+msgid "Playbook Directory"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:52
+#: client/src/lists/ScheduledJobs.js:57
+msgid "Playbook Run"
+msgstr ""
+
+#: client/src/license/license.partial.html:84
+msgid "Please click the button below to visit Ansible's website to get a Tower license key."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1026
+#: client/src/shared/form-generator.js:896
+msgid "Please enter a URL that begins with ssh, http or https.  The URL may not contain the '@' character."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1014
+#: client/src/shared/form-generator.js:884
+msgid "Please enter a valid email address."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1009
+#: client/src/shared/form-generator.js:879
+msgid "Please enter a value."
+msgstr ""
+
+#: client/src/lists/CompletedJobs.js:13
+msgid "Please save and run a job to view"
+msgstr ""
+
+#: client/src/notifications/notifications.list.js:15
+msgid "Please save before adding notifications"
+msgstr ""
+
+#: client/src/forms/Teams.js:74
+msgid "Please save before adding users"
+msgstr ""
+
+#: client/src/forms/Inventories.js:93
+#: client/src/forms/JobTemplates.js:414
+#: client/src/forms/Organizations.js:60
+#: client/src/forms/Projects.js:232
+#: client/src/forms/Teams.js:112
+msgid "Please save before assigning permissions"
+msgstr ""
+
+#: client/src/forms/Users.js:128
+#: client/src/forms/Users.js:172
+msgid "Please save before assigning to organizations"
+msgstr ""
+
+#: client/src/forms/Users.js:151
+msgid "Please save before assigning to teams"
+msgstr ""
+
+#: client/src/notifications/shared/type-change.service.js:27
+msgid "Port"
+msgstr ""
+
+#: client/src/forms/Credentials.js:260
+#: client/src/helpers/Credentials.js:36
+#: client/src/helpers/Credentials.js:60
+msgid "Private Key"
+msgstr ""
+
+#: client/src/forms/Credentials.js:267
+msgid "Private Key Passphrase"
+msgstr ""
+
+#: client/src/forms/Credentials.js:284
+#: client/src/forms/Credentials.js:288
+msgid "Privilege Escalation"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:90
+msgid "Privilege Escalation Password"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:89
+msgid "Privilege Escalation Username"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:106
+#: client/src/forms/JobTemplates.js:90
+#: client/src/helpers/Credentials.js:103
+msgid "Project"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:132
+msgid "Project (Tenant Name)"
+msgstr ""
+
+#: client/src/forms/Projects.js:80
+#: client/src/forms/Projects.js:88
+msgid "Project Base Path"
+msgstr ""
+
+#: client/src/forms/Credentials.js:370
+msgid "Project Name"
+msgstr ""
+
+#: client/src/forms/Projects.js:106
+msgid "Project Path"
+msgstr ""
+
+#: client/src/dashboard/counts/dashboard-counts.directive.js:66
+msgid "Project Sync Failures"
+msgstr ""
+
+#: client/src/controllers/Projects.js:243
+msgid "Project lookup failed. GET returned:"
+msgstr ""
+
+#: client/src/dashboard/counts/dashboard-counts.directive.js:61
+#: client/src/lists/Projects.js:15
+#: client/src/lists/Projects.js:16
+msgid "Projects"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:147
+#: client/src/forms/JobTemplates.js:216
+#: client/src/forms/JobTemplates.js:250
+#: client/src/forms/JobTemplates.js:270
+#: client/src/forms/JobTemplates.js:370
+msgid "Prompt on launch"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:308
+#: client/src/forms/JobTemplates.js:318
+msgid "Provisioning Callback URL"
+msgstr ""
+
+#: client/src/dashboard/lists/jobs/jobs-list.partial.html:4
+msgid "RECENT JOB RUNS"
+msgstr ""
+
+#: client/src/dashboard/lists/jobs/jobs-list.partial.html:42
+msgid "RECENTLY RUN JOBS"
+msgstr ""
+
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:4
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:52
+msgid "RECENTLY USED JOB TEMPLATES"
+msgstr ""
+
+#: client/src/lists/Projects.js:77
+#: client/src/partials/jobs.html:20
+#: client/src/portal-mode/portal-mode-jobs.partial.html:12
+msgid "REFRESH"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:98
+msgid "RSA Private Key"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:94
+#: client/src/notifications/notificationTemplates.form.js:99
+msgid "Recipient List"
+msgstr ""
+
+#: client/src/bread-crumb/bread-crumb.partial.html:6
+#: client/src/lists/Projects.js:73
+#: client/src/partials/jobs.html:19
+msgid "Refresh the page"
+msgstr ""
+
+#: client/src/forms/Teams.js:141
+#: client/src/forms/Users.js:201
+msgid "Remove"
+msgstr ""
+
+#: client/src/license/license.partial.html:89
+msgid "Request License"
+msgstr ""
+
+#: client/src/forms/Credentials.js:466
+#: client/src/forms/Inventories.js:121
+#: client/src/forms/Organizations.js:87
+#: client/src/forms/Teams.js:101
+#: client/src/forms/Teams.js:134
+#: client/src/forms/Users.js:194
+msgid "Role"
+msgstr ""
+
+#: client/src/forms/Projects.js:161
+msgid "SCM Clean"
+msgstr ""
+
+#: client/src/forms/Projects.js:138
+msgid "SCM Credential"
+msgstr ""
+
+#: client/src/forms/Projects.js:174
+msgid "SCM Delete"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:93
+msgid "SCM Private Key"
+msgstr ""
+
+#: client/src/forms/Projects.js:60
+msgid "SCM Type"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:49
+#: client/src/forms/Projects.js:186
+#: client/src/lists/ScheduledJobs.js:58
+msgid "SCM Update"
+msgstr ""
+
+#: client/src/controllers/Projects.js:284
+msgid "SCM Update Cancel"
+msgstr ""
+
+#: client/src/forms/Projects.js:150
+msgid "SCM Update Options"
+msgstr ""
+
+#: client/src/controllers/Projects.js:70
+msgid "SCM update currently running"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:59
+msgid "SETTINGS"
+msgstr ""
+
+#: client/src/login/loginModal/loginModal.partial.html:93
+msgid "SIGN IN"
+msgstr ""
+
+#: client/src/app.js:518
+msgid "SOCKETS"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:166
+msgid "SSH Key"
+msgstr ""
+
+#: client/src/forms/Credentials.js:258
+msgid "SSH key description"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:384
+msgid "SSL Connection"
+msgstr ""
+
+#: client/src/forms/Credentials.js:122
+#: client/src/forms/Credentials.js:129
+msgid "STS Token"
+msgstr ""
+
+#: client/src/dashboard/graphs/job-status/job-status-graph.directive.js:64
+msgid "SUCCESSFUL"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:149
+msgid "Satellite 6 Host"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1736
+msgid "Save"
+msgstr ""
+
+#: client/src/license/license.partial.html:122
+msgid "Save successful!"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:77
+msgid "Schedule"
+msgstr ""
+
+#: client/src/management-jobs/card/card.partial.html:26
+msgid "Schedule Management Job"
+msgstr ""
+
+#: client/src/controllers/Projects.js:62
+msgid "Schedule future SCM updates"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:80
+msgid "Schedule future job template runs"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:15
+msgid "Scheduled Jobs"
+msgstr ""
+
+#: client/src/partials/jobs.html:15
+msgid "Schedules"
+msgstr ""
+
+#: client/src/forms/Credentials.js:107
+msgid "Secret Key"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:83
+msgid "Sender Email"
+msgstr ""
+
+#: client/src/helpers/Credentials.js:97
+msgid "Service Account Email Address"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:147
+msgid "Settings"
+msgstr ""
+
+#: client/src/shared/form-generator.js:912
+msgid "Show"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:255
+#: client/src/forms/JobTemplates.js:265
+msgid "Skip Tags"
+msgstr ""
+
+#: client/src/forms/Projects.js:24
+msgid "Source Details"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:196
+msgid "Source Phone Number"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:17
+msgid "Split up your organization to associate content and control permissions for groups."
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:72
+#: client/src/lists/PortalJobTemplates.js:43
+msgid "Start a job using this template"
+msgstr ""
+
+#: client/src/controllers/Projects.js:61
+msgid "Start an SCM update"
+msgstr ""
+
+#: client/src/license/license.partial.html:121
+msgid "Submit"
+msgstr ""
+
+#: client/src/license/license.partial.html:27
+msgid "Subscription"
+msgstr ""
+
+#: client/src/forms/Credentials.js:153
+#: client/src/forms/Credentials.js:164
+msgid "Subscription ID"
+msgstr ""
+
+#: client/src/notifications/notifications.list.js:38
+msgid "Success"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:77
+msgid "Successful"
+msgstr ""
+
+#: client/src/lists/Inventories.js:76
+msgid "Sync failures?"
+msgstr ""
+
+#: client/src/controllers/Users.js:18
+msgid "System Administrator"
+msgstr ""
+
+#: client/src/controllers/Users.js:17
+msgid "System Auditor"
+msgstr ""
+
+#: client/src/app.js:346
+msgid "TEAMS"
+msgstr ""
+
+#: client/src/dashboard/graphs/job-status/job-status-graph.directive.js:106
+msgid "TIME"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:313
+msgid "Target URL"
+msgstr ""
+
+#: client/src/forms/Credentials.js:473
+#: client/src/forms/Inventories.js:128
+#: client/src/forms/Organizations.js:94
+msgid "Team Roles"
+msgstr ""
+
+#: client/src/forms/Users.js:154
+#: client/src/lists/Teams.js:16
+#: client/src/lists/Teams.js:17
+#: client/src/setup-menu/setup-menu.partial.html:16
+msgid "Teams"
+msgstr ""
+
+#: client/src/forms/Credentials.js:342
+msgid "Tenant ID"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.list.js:65
+msgid "Test notification"
+msgstr ""
+
+#: client/src/controllers/Projects.js:927
+msgid "The SCM update process is running."
+msgstr ""
+
+#: client/src/controllers/Projects.js:232
+msgid "The selected project is not configured for SCM. To configure for SCM, edit the project and provide SCM settings, and then run an update."
+msgstr ""
+
+#: client/src/lists/PortalJobTemplates.js:20
+msgid "There are no job templates to display at this time"
+msgstr ""
+
+#: client/src/lists/PortalJobs.js:20
+msgid "There are no jobs to display at this time"
+msgstr ""
+
+#: client/src/controllers/Projects.js:223
+msgid "There is no SCM update information available for this project. An update has not yet been  completed.  If you have not already done so, start an update for this project."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1020
+#: client/src/shared/form-generator.js:890
+msgid "This value does not match the password you entered previously.  Please confirm that password."
+msgstr ""
+
+#: client/src/dashboard/lists/jobs/jobs-list.partial.html:14
+msgid "Time"
+msgstr ""
+
+#: client/src/license/license.partial.html:45
+msgid "Time Remaining"
+msgstr ""
+
+#: client/src/shared/form-generator.js:929
+msgid "Toggle the display of plaintext."
+msgstr ""
+
+#: client/src/notifications/shared/type-change.service.js:34
+#: client/src/notifications/shared/type-change.service.js:40
+msgid "Token"
+msgstr ""
+
+#: client/src/forms/Credentials.js:62
+#: client/src/forms/Credentials.js:87
+#: client/src/forms/Teams.js:129
+#: client/src/forms/Users.js:189
+#: client/src/lists/CompletedJobs.js:63
+#: client/src/lists/Credentials.js:39
+#: client/src/lists/Projects.js:46
+#: client/src/lists/ScheduledJobs.js:44
+#: client/src/notifications/notificationTemplates.form.js:53
+#: client/src/notifications/notificationTemplates.list.js:38
+#: client/src/notifications/notifications.list.js:31
+msgid "Type"
+msgstr ""
+
+#: client/src/forms/Credentials.js:23
+#: client/src/notifications/notificationTemplates.form.js:21
+msgid "Type Details"
+msgstr ""
+
+#: client/src/login/loginModal/loginModal.partial.html:45
+msgid "USERNAME"
+msgstr ""
+
+#: client/src/app.js:468
+msgid "USERS"
+msgstr ""
+
+#: client/src/controllers/Projects.js:328
+msgid "Update Not Found"
+msgstr ""
+
+#: client/src/forms/Projects.js:181
+msgid "Update on Launch"
+msgstr ""
+
+#: client/src/license/license.partial.html:71
+msgid "Upgrade"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:404
+msgid "Use SSL"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.form.js:397
+msgid "Use TLS"
+msgstr ""
+
+#: client/src/forms/Credentials.js:461
+#: client/src/forms/Inventories.js:116
+#: client/src/forms/Organizations.js:82
+#: client/src/forms/Teams.js:96
+msgid "User"
+msgstr ""
+
+#: client/src/forms/Users.js:99
+msgid "User Type"
+msgstr ""
+
+#: client/src/forms/Users.js:50
+#: client/src/helpers/Credentials.js:117
+#: client/src/helpers/Credentials.js:32
+#: client/src/helpers/Credentials.js:56
+#: client/src/helpers/Credentials.js:88
+#: client/src/lists/Users.js:27
+#: client/src/notifications/notificationTemplates.form.js:64
+msgid "Username"
+msgstr ""
+
+#: client/src/forms/Teams.js:77
+#: client/src/lists/Users.js:16
+#: client/src/lists/Users.js:17
+#: client/src/setup-menu/setup-menu.partial.html:10
+msgid "Users"
+msgstr ""
+
+#: client/src/dashboard/lists/job-templates/job-templates-list.partial.html:7
+#: client/src/dashboard/lists/jobs/jobs-list.partial.html:7
+msgid "VIEW ALL"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:75
+msgid "VIEW DOCUMENTATION"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:51
+msgid "VIEW USER PAGE FOR {{ $root.current_user.username | uppercase }}"
+msgstr ""
+
+#: client/src/license/license.partial.html:10
+msgid "Valid License"
+msgstr ""
+
+#: client/src/forms/Inventories.js:54
+msgid "Variables"
+msgstr ""
+
+#: client/src/forms/Credentials.js:400
+msgid "Vault Password"
+msgstr ""
+
+#: client/src/forms/JobTemplates.js:221
+#: client/src/forms/JobTemplates.js:229
+msgid "Verbosity"
+msgstr ""
+
+#: client/src/about/about.controller.js:24
+#: client/src/license/license.partial.html:15
+msgid "Version"
+msgstr ""
+
+#: client/src/dashboard/graphs/dashboard-graphs.partial.html:58
+#: client/src/inventory-scripts/inventory-scripts.list.js:65
+#: client/src/lists/Credentials.js:82
+#: client/src/lists/Inventories.js:112
+#: client/src/lists/JobTemplates.js:101
+#: client/src/lists/Teams.js:70
+#: client/src/lists/Users.js:68
+#: client/src/notifications/notificationTemplates.list.js:80
+msgid "View"
+msgstr ""
+
+#: client/src/main-menu/main-menu.partial.html:173
+msgid "View Documentation"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1760
+msgid "View Survey"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:47
+msgid "View Your License"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:48
+msgid "View and edit your license information."
+msgstr ""
+
+#: client/src/lists/Credentials.js:84
+msgid "View credential"
+msgstr ""
+
+#: client/src/setup-menu/setup-menu.partial.html:54
+msgid "View information about this version of Ansible Tower."
+msgstr ""
+
+#: client/src/lists/Inventories.js:114
+msgid "View inventory"
+msgstr ""
+
+#: client/src/inventory-scripts/inventory-scripts.list.js:67
+msgid "View inventory script"
+msgstr ""
+
+#: client/src/notifications/notificationTemplates.list.js:82
+msgid "View notification"
+msgstr ""
+
+#: client/src/lists/Teams.js:73
+msgid "View team"
+msgstr ""
+
+#: client/src/lists/JobTemplates.js:103
+msgid "View template"
+msgstr ""
+
+#: client/src/lists/Projects.js:109
+msgid "View the project"
+msgstr ""
+
+#: client/src/lists/ScheduledJobs.js:88
+msgid "View the schedule"
+msgstr ""
+
+#: client/src/lists/Users.js:71
+msgid "View user"
+msgstr ""
+
+#: client/src/login/loginModal/loginModal.partial.html:13
+msgid "Welcome to Ansible Tower!  Please sign in."
+msgstr ""
+
+#: client/src/license/license.partial.html:78
+msgid "Welcome to Ansible Tower! Please complete the steps below to acquire a license."
+msgstr ""
+
+#: client/src/lists/Inventories.js:79
+msgid "Yes"
+msgstr ""
+
+#: client/src/shared/form-generator.js:1034
+msgid "Your password must be %d characters long."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1040
+msgid "Your password must contain a lowercase letter."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1052
+msgid "Your password must contain a number."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1046
+msgid "Your password must contain an uppercase letter."
+msgstr ""
+
+#: client/src/shared/form-generator.js:1058
+msgid "Your password must contain one of the following characters: %s"
+msgstr ""
+
+#: client/src/controllers/Projects.js:284
+msgid "Your request to cancel the update was submitted to the task manager."
+msgstr ""
+
+#: client/src/forms/Credentials.js:140
+#: client/src/forms/Credentials.js:369
+msgid "set in helpers/credentials"
+msgstr ""
diff --git a/awx/ui/webpack.config.js b/awx/ui/webpack.config.js
index 57d8dd880c..e598f4154a 100644
--- a/awx/ui/webpack.config.js
+++ b/awx/ui/webpack.config.js
@@ -7,6 +7,7 @@ var vendorPkgs = [
     'angular-codemirror',
     'angular-cookies',
     'angular-drag-and-drop-lists',
+    'angular-gettext',
     'angular-md5',
     'angular-moment',
     'angular-sanitize',

From d8b1281d57078eed087848b2a4f206e722a762b5 Mon Sep 17 00:00:00 2001
From: jaredevantabor 
Date: Thu, 20 Oct 2016 16:36:58 -0700
Subject: [PATCH 10/21] adding i18n reference to a few files

---
 awx/ui/client/src/app.js                          | 9 ++++-----
 awx/ui/client/src/shared/socket/socket.service.js | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 4e4f5b0b92..b7a3c25d43 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -458,6 +458,7 @@ var tower = angular.module('Tower', [
         ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
         $filter, SocketService, I18NInit) {
 
+        I18NInit();
         $stateExtender.addState({
             name: 'dashboard',
             url: '/home',
@@ -495,7 +496,7 @@ var tower = angular.module('Tower', [
             templateUrl: urlPrefix + 'partials/jobs.html',
             controller: JobsListController,
             ncyBreadcrumb: {
-                label: N("JOBS")
+                label: N_("JOBS")
             },
             params: {
                 search: {
@@ -520,7 +521,7 @@ var tower = angular.module('Tower', [
                 activityStreamTarget: 'project'
             },
             ncyBreadcrumb: {
-                label: N("PROJECTS")
+                label: N_("PROJECTS")
             },
             socket: {
                 "groups":{
@@ -536,7 +537,7 @@ var tower = angular.module('Tower', [
             controller: ProjectsAdd,
             ncyBreadcrumb: {
                 parent: "projects",
-                label: N("CREATE PROJECT")
+                label: N_("CREATE PROJECT")
             },
             socket: {
                 "groups":{
@@ -578,8 +579,6 @@ var tower = angular.module('Tower', [
             controller: OrganizationsAdd
         });
 
-        I18NInit();
-
         $rootScope.addPermission = function(scope) {
             $compile("")(scope);
         };
diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js
index 9828689649..5cd9ebfe40 100644
--- a/awx/ui/client/src/shared/socket/socket.service.js
+++ b/awx/ui/client/src/shared/socket/socket.service.js
@@ -5,8 +5,8 @@
  *************************************************/
 import ReconnectingWebSocket from 'reconnectingwebsocket';
 export default
-['$rootScope', '$location', '$log','$state', '$q',
-    function ($rootScope, $location, $log, $state, $q) {
+['$rootScope', '$location', '$log','$state', '$q', 'i18n',
+    function ($rootScope, $location, $log, $state, $q, i18n) {
         var needsResubscribing = false,
         socketPromise = $q.defer();
         return {

From 4b34c6987aaac6ca95aa2df01ee29a7b2f82a7ab Mon Sep 17 00:00:00 2001
From: Leigh Johnson 
Date: Tue, 25 Oct 2016 17:12:27 -0400
Subject: [PATCH 11/21] Remove `make languages` target pending delivery of .po
 files

---
 Makefile | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 3112a2f4bd..a9df006bc4 100644
--- a/Makefile
+++ b/Makefile
@@ -536,11 +536,11 @@ else
 endif
 
 # generate l10n .json
-languages: awx/ui/package.json check-po
+languages: $(UI_DEPS_FLAG_FILE) check-po
 	$(NPM_BIN) --prefix awx/ui run languages
 
 # generate .pot
-pot: awx/ui/package.json
+pot: $(UI_DEPS_FLAG_FILE)
 	$(NPM_BIN) --prefix awx/ui run pot
 
 ui-deps: $(UI_DEPS_FLAG_FILE)
@@ -555,8 +555,9 @@ ui-docker-machine: $(UI_DEPS_FLAG_FILE)
 ui-docker: $(UI_DEPS_FLAG_FILE)
 	$(NPM_BIN) --prefix awx/ui run build-docker-cid
 
-ui-release: languages $(UI_RELEASE_FLAG_FILE)
+ui-release: $(UI_RELEASE_FLAG_FILE)
 
+# todo: include languages target when .po deliverables are added to source control
 $(UI_RELEASE_FLAG_FILE): $(UI_DEPS_FLAG_FILE)
 	$(NPM_BIN) --prefix awx/ui run build-release
 	touch $(UI_RELEASE_FLAG_FILE)

From b98524dc91d08e5f6511b964648a29886d902788 Mon Sep 17 00:00:00 2001
From: jaredevantabor 
Date: Tue, 25 Oct 2016 15:46:45 -0700
Subject: [PATCH 12/21] Temporarily commenting out request for language files

in order to avoid 404 file not found error on the console until the i18n
team provies the language files
---
 awx/ui/client/src/i18n.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/i18n.js b/awx/ui/client/src/i18n.js
index 7a353583e6..c5e5b782de 100644
--- a/awx/ui/client/src/i18n.js
+++ b/awx/ui/client/src/i18n.js
@@ -81,7 +81,10 @@ export default
             var langUrl = langInfo.replace('-', '_');
             //gettextCatalog.debug = true;
             gettextCatalog.setCurrentLanguage(langInfo);
-            gettextCatalog.loadRemote('/static/languages/' + langUrl + '.json');
+            // TODO: the line below is commented out temporarily until
+            // the .po files are received from the i18n team, in order to avoid
+            // 404 file not found console errors in dev 
+            // gettextCatalog.loadRemote('/static/languages/' + langUrl + '.json');
         };
     }])
     .factory('i18n', ['gettextCatalog',

From ffeb2b22a492febf12c0e8232ca078e775fe02c5 Mon Sep 17 00:00:00 2001
From: Aaron Tan 
Date: Tue, 25 Oct 2016 19:28:24 -0400
Subject: [PATCH 13/21] Unit test added.

---
 awx/main/tests/unit/scheduler/test_dag.py | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/awx/main/tests/unit/scheduler/test_dag.py b/awx/main/tests/unit/scheduler/test_dag.py
index 84fb2d37f2..ab1e45c3d8 100644
--- a/awx/main/tests/unit/scheduler/test_dag.py
+++ b/awx/main/tests/unit/scheduler/test_dag.py
@@ -154,7 +154,25 @@ def workflow_dag_finished(factory_node):
     expected = []
     return (dag, expected, True)
 
-@pytest.fixture(params=['workflow_dag_multiple_roots', 'workflow_dag_level_2', 'workflow_dag_multiple_edges_labeled', 'workflow_dag_finished'])
+@pytest.fixture
+def workflow_dag_always(factory_node):
+    dag = WorkflowDAG()
+    data = [
+        factory_node(0, 'failed'),
+        factory_node(1, 'successful'),
+        factory_node(2, None),
+    ]
+    [dag.add_node(d) for d in data]
+
+    dag.add_edge(data[0], data[1], 'always_nodes')
+    dag.add_edge(data[1], data[2], 'always_nodes')
+
+    expected = data[2:3]
+    return (dag, expected, False)
+
+@pytest.fixture(params=['workflow_dag_multiple_roots', 'workflow_dag_level_2',
+                        'workflow_dag_multiple_edges_labeled', 'workflow_dag_finished',
+                        'workflow_dag_always'])
 def workflow_dag(request):
     return request.getfuncargvalue(request.param)
 

From 8165141210c95a86a68e009a9f8f0432154b3f00 Mon Sep 17 00:00:00 2001
From: AlanCoding 
Date: Wed, 26 Oct 2016 09:28:20 -0400
Subject: [PATCH 14/21] expand documentation for WFJT node list

---
 .../workflow_job_template_workflow_nodes_list.md   | 14 ++++++++++++++
 awx/api/views.py                                   |  9 +++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 awx/api/templates/api/workflow_job_template_workflow_nodes_list.md

diff --git a/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md b/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
new file mode 100644
index 0000000000..feb48373cb
--- /dev/null
+++ b/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
@@ -0,0 +1,14 @@
+# Workflow Job Template Workflow Node List
+
+Workflow nodes reference templates to execute and define the ordering
+in which to execute them. After a job ran as part of a workflow finishes
+the subsequent actions will be to.
+
+ - run nodes contained in "failure_nodes" or "always_nodes" if job failed
+ - run nodes contained in "success_nodes" or "always_nodes" if job succeeded
+
+The workflow will be marked as failed if any jobs ran as a part of the workflow
+fail and have the field `fail_on_job_failure` set to true. If not, the
+workflow job will be marked as successful.
+
+{% include "api/sub_list_create_api_view.md" %}
\ No newline at end of file
diff --git a/awx/api/views.py b/awx/api/views.py
index 2327f11b6a..d22c030965 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -2404,6 +2404,7 @@ class JobTemplateLabelList(DeleteLastUnattachLabelMixin, SubListCreateAttachDeta
     serializer_class = LabelSerializer
     parent_model = JobTemplate
     relationship = 'labels'
+    new_in_300 = True
 
     def post(self, request, *args, **kwargs):
         # If a label already exists in the database, attach it instead of erroring out
@@ -2697,6 +2698,7 @@ class WorkflowJobTemplateList(ListCreateAPIView):
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateListSerializer
     always_allow_superuser = False
+    new_in_310 = True
 
     # TODO: RBAC
     '''
@@ -2714,10 +2716,12 @@ class WorkflowJobTemplateDetail(RetrieveUpdateDestroyAPIView):
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateSerializer
     always_allow_superuser = False
+    new_in_310 = True
 
 
 class WorkflowJobTemplateLabelList(JobTemplateLabelList):
     parent_model = WorkflowJobTemplate
+    new_in_310 = True
 
 
 # TODO:
@@ -2725,6 +2729,7 @@ class WorkflowJobTemplateLaunch(GenericAPIView):
 
     model = WorkflowJobTemplate
     serializer_class = EmptySerializer
+    new_in_310 = True
 
     def get(self, request, *args, **kwargs):
         data = {}
@@ -2750,6 +2755,7 @@ class WorkflowJobTemplateWorkflowNodesList(SubListCreateAPIView):
     parent_model = WorkflowJobTemplate
     relationship = 'workflow_job_template_nodes'
     parent_key = 'workflow_job_template'
+    new_in_310 = True
 
     def update_raw_data(self, data):
         for fd in ['job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags']:
@@ -2770,12 +2776,14 @@ class WorkflowJobList(ListCreateAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobListSerializer
+    new_in_310 = True
 
 # TODO:
 class WorkflowJobDetail(RetrieveDestroyAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobSerializer
+    new_in_310 = True
 
 class WorkflowJobWorkflowNodesList(SubListAPIView):
 
@@ -2785,6 +2793,7 @@ class WorkflowJobWorkflowNodesList(SubListAPIView):
     parent_model = WorkflowJob
     relationship = 'workflow_job_nodes'
     parent_key = 'workflow_job'
+    new_in_310 = True
 
 class SystemJobTemplateList(ListAPIView):
 

From 2794d62b4a274ceccc1f16b31ef1d8a1ec72b975 Mon Sep 17 00:00:00 2001
From: AlanCoding 
Date: Wed, 26 Oct 2016 09:35:00 -0400
Subject: [PATCH 15/21] fix null problem with char_prompts

---
 awx/api/serializers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 70e37b8220..26730745de 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -2242,10 +2242,10 @@ class WorkflowJobListSerializer(WorkflowJobSerializer, UnifiedJobListSerializer)
     pass
 
 class WorkflowNodeBaseSerializer(BaseSerializer):
-    job_type = serializers.CharField(allow_blank=True, required=False, default=None)
-    job_tags = serializers.CharField(allow_blank=True, required=False, default=None)
-    limit = serializers.CharField(allow_blank=True, required=False, default=None)
-    skip_tags = serializers.CharField(allow_blank=True, required=False, default=None)
+    job_type = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
+    job_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
+    limit = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
+    skip_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
     success_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
     failure_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
     always_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)

From 6b4737b5f0ded82f318638ab7ad484452e8e19d4 Mon Sep 17 00:00:00 2001
From: AlanCoding 
Date: Wed, 26 Oct 2016 09:53:54 -0400
Subject: [PATCH 16/21] more WFJT node docs feedback

---
 .../api/workflow_job_template_workflow_nodes_list.md   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md b/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
index feb48373cb..e6b078a23f 100644
--- a/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
+++ b/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
@@ -1,14 +1,14 @@
 # Workflow Job Template Workflow Node List
 
 Workflow nodes reference templates to execute and define the ordering
-in which to execute them. After a job ran as part of a workflow finishes
-the subsequent actions will be to.
+in which to execute them. After a job in this workflow finishes,
+the subsequent actions are to:
 
  - run nodes contained in "failure_nodes" or "always_nodes" if job failed
  - run nodes contained in "success_nodes" or "always_nodes" if job succeeded
 
-The workflow will be marked as failed if any jobs ran as a part of the workflow
-fail and have the field `fail_on_job_failure` set to true. If not, the
-workflow job will be marked as successful.
+The workflow is marked as failed if any jobs run as part of that workflow fail
+and have the field `fail_on_job_failure` set to true. If not, the workflow
+job is marked as successful.
 
 {% include "api/sub_list_create_api_view.md" %}
\ No newline at end of file

From 0e99d150bbc8d95e3856c2f5cad75c5209114b45 Mon Sep 17 00:00:00 2001
From: AlanCoding 
Date: Wed, 26 Oct 2016 09:57:57 -0400
Subject: [PATCH 17/21] correct error in workflow unit tests

---
 awx/api/serializers.py                           | 1 -
 awx/main/tests/unit/models/test_workflow_unit.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index 26730745de..d681fac426 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -2267,7 +2267,6 @@ class WorkflowNodeBaseSerializer(BaseSerializer):
 
     def validate(self, attrs):
         # char_prompts go through different validation, so remove them here
-        print ' attrs: ' + str(attrs)
         for fd in ['job_type', 'job_tags', 'skip_tags', 'limit']:
             if fd in attrs:
                 attrs.pop(fd)
diff --git a/awx/main/tests/unit/models/test_workflow_unit.py b/awx/main/tests/unit/models/test_workflow_unit.py
index bcbec85c81..bc7e9b5bce 100644
--- a/awx/main/tests/unit/models/test_workflow_unit.py
+++ b/awx/main/tests/unit/models/test_workflow_unit.py
@@ -217,7 +217,7 @@ class TestWorkflowWarnings:
 
     def test_warn_scan_errors_node_prompts(self, job_node_with_prompts):
         job_node_with_prompts.unified_job_template.job_type = 'scan'
-        job_node_with_prompts.job_type = 'run'
+        job_node_with_prompts.char_prompts['job_type'] = 'run'
         job_node_with_prompts.inventory = Inventory(name='different-inventory', pk=23)
         assert 'ignored' in job_node_with_prompts.get_prompts_warnings()
         assert 'job_type' in job_node_with_prompts.get_prompts_warnings()['ignored']

From 04a094aa7c3903bd9a1e0355a7fd792d2910a083 Mon Sep 17 00:00:00 2001
From: Leigh Johnson 
Date: Wed, 26 Oct 2016 16:20:31 -0400
Subject: [PATCH 18/21] npm shrinkwrap i18n dependencies

---
 awx/ui/npm-shrinkwrap.json | 4738 ++++++++++++++++++++++++++++++++++++
 1 file changed, 4738 insertions(+)
 create mode 100644 awx/ui/npm-shrinkwrap.json

diff --git a/awx/ui/npm-shrinkwrap.json b/awx/ui/npm-shrinkwrap.json
new file mode 100644
index 0000000000..e22bbbc3f6
--- /dev/null
+++ b/awx/ui/npm-shrinkwrap.json
@@ -0,0 +1,4738 @@
+{
+  "name": "ansible-tower",
+  "version": "3.1.0",
+  "dependencies": {
+    "abbrev": {
+      "version": "1.0.9",
+      "from": "abbrev@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
+    },
+    "accepts": {
+      "version": "1.3.3",
+      "from": "accepts@>=1.3.3 <1.4.0",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"
+    },
+    "acorn": {
+      "version": "3.3.0",
+      "from": "acorn@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"
+    },
+    "adm-zip": {
+      "version": "0.4.7",
+      "from": "adm-zip@>=0.4.3 <0.5.0",
+      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz"
+    },
+    "after": {
+      "version": "0.8.1",
+      "from": "after@0.8.1",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.1.tgz"
+    },
+    "agent-base": {
+      "version": "2.0.1",
+      "from": "agent-base@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz",
+      "dependencies": {
+        "semver": {
+          "version": "5.0.3",
+          "from": "semver@>=5.0.1 <5.1.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz"
+        }
+      }
+    },
+    "align-text": {
+      "version": "0.1.4",
+      "from": "align-text@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
+    },
+    "almond": {
+      "version": "0.3.3",
+      "from": "almond@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz"
+    },
+    "amdefine": {
+      "version": "1.0.0",
+      "from": "amdefine@>=0.0.4",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
+    },
+    "angular": {
+      "version": "1.4.14",
+      "from": "angular@>=1.4.7 <1.5.0",
+      "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.14.tgz"
+    },
+    "angular-breadcrumb": {
+      "version": "0.4.1",
+      "from": "leigh-johnson/angular-breadcrumb#0.4.1",
+      "resolved": "git://github.com/leigh-johnson/angular-breadcrumb.git#6c2b1ad45ad5fbe7adf39af1ef3b294ca8e207a9"
+    },
+    "angular-codemirror": {
+      "version": "1.0.4",
+      "from": "chouseknecht/angular-codemirror#1.0.4",
+      "resolved": "git://github.com/chouseknecht/angular-codemirror.git#75c3a2d0ccdf2e4c836fab7d7617d5db6c585c1b",
+      "dependencies": {
+        "angular": {
+          "version": "1.4.7",
+          "from": "angular@1.4.7",
+          "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz"
+        }
+      }
+    },
+    "angular-cookies": {
+      "version": "1.5.8",
+      "from": "angular-cookies@>=1.4.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.5.8.tgz"
+    },
+    "angular-drag-and-drop-lists": {
+      "version": "1.4.0",
+      "from": "leigh-johnson/angular-drag-and-drop-lists#1.4.0",
+      "resolved": "git://github.com/leigh-johnson/angular-drag-and-drop-lists.git#4d32654ab7159689a7767b9be8fc85f9812ca5a8"
+    },
+    "angular-filters": {
+      "version": "1.1.2",
+      "from": "angular-filters@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/angular-filters/-/angular-filters-1.1.2.tgz"
+    },
+    "angular-gettext": {
+      "version": "2.3.8",
+      "from": "angular-gettext@>=2.3.5 <3.0.0",
+      "resolved": "https://registry.npmjs.org/angular-gettext/-/angular-gettext-2.3.8.tgz"
+    },
+    "angular-gettext-tools": {
+      "version": "2.3.0",
+      "from": "angular-gettext-tools@>=2.3.0 <2.4.0",
+      "resolved": "https://registry.npmjs.org/angular-gettext-tools/-/angular-gettext-tools-2.3.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "angular-md5": {
+      "version": "0.1.10",
+      "from": "angular-md5@>=0.1.8 <0.2.0",
+      "resolved": "https://registry.npmjs.org/angular-md5/-/angular-md5-0.1.10.tgz"
+    },
+    "angular-moment": {
+      "version": "0.10.3",
+      "from": "angular-moment@>=0.10.1 <0.11.0",
+      "resolved": "https://registry.npmjs.org/angular-moment/-/angular-moment-0.10.3.tgz",
+      "dependencies": {
+        "moment": {
+          "version": "2.10.6",
+          "from": "moment@>=2.8.0 <2.11.0",
+          "resolved": "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz"
+        }
+      }
+    },
+    "angular-resource": {
+      "version": "1.5.8",
+      "from": "angular-resource@>=1.4.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/angular-resource/-/angular-resource-1.5.8.tgz"
+    },
+    "angular-sanitize": {
+      "version": "1.5.8",
+      "from": "angular-sanitize@>=1.4.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.5.8.tgz"
+    },
+    "angular-scheduler": {
+      "version": "0.1.0",
+      "from": "chouseknecht/angular-scheduler#0.1.0",
+      "resolved": "git://github.com/chouseknecht/angular-scheduler.git#784693054597b9a1c1e49efb4cf94e9054b92e66",
+      "dependencies": {
+        "angular-tz-extensions": {
+          "version": "0.3.11",
+          "from": "chouseknecht/angular-tz-extensions",
+          "resolved": "git://github.com/chouseknecht/angular-tz-extensions.git#a9b70c69ba27a19e1b1f9facbd85e870060aace9",
+          "dependencies": {
+            "angular": {
+              "version": "1.4.7",
+              "from": "angular@1.4.7",
+              "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz"
+            },
+            "jquery": {
+              "version": "3.1.1",
+              "from": "jquery@>=3.1.0 <4.0.0",
+              "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.1.1.tgz"
+            }
+          }
+        },
+        "lodash": {
+          "version": "3.8.0",
+          "from": "lodash@>=3.8.0 <3.9.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.8.0.tgz"
+        }
+      }
+    },
+    "angular-tz-extensions": {
+      "version": "0.3.11",
+      "from": "chouseknecht/angular-tz-extensions#0.3.11",
+      "resolved": "git://github.com/chouseknecht/angular-tz-extensions.git#a9b70c69ba27a19e1b1f9facbd85e870060aace9",
+      "dependencies": {
+        "angular": {
+          "version": "1.4.7",
+          "from": "angular@1.4.7",
+          "resolved": "https://registry.npmjs.org/angular/-/angular-1.4.7.tgz"
+        },
+        "jquery": {
+          "version": "3.1.1",
+          "from": "jquery@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.1.1.tgz"
+        }
+      }
+    },
+    "angular-ui-router": {
+      "version": "0.2.18",
+      "from": "angular-ui-router@>=0.2.15 <0.3.0",
+      "resolved": "https://registry.npmjs.org/angular-ui-router/-/angular-ui-router-0.2.18.tgz"
+    },
+    "ansi-regex": {
+      "version": "2.0.0",
+      "from": "ansi-regex@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "from": "ansi-styles@>=2.2.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+    },
+    "anymatch": {
+      "version": "1.3.0",
+      "from": "anymatch@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz"
+    },
+    "archiver": {
+      "version": "1.1.0",
+      "from": "archiver@1.1.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.1.0.tgz",
+      "dependencies": {
+        "async": {
+          "version": "2.1.2",
+          "from": "async@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.1.2.tgz"
+        },
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+        },
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.8.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "archiver-utils": {
+      "version": "1.3.0",
+      "from": "archiver-utils@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.3.0.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+        },
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.8.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "argparse": {
+      "version": "1.0.9",
+      "from": "argparse@>=1.0.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "from": "arr-diff@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz"
+    },
+    "arr-flatten": {
+      "version": "1.0.1",
+      "from": "arr-flatten@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz"
+    },
+    "array-differ": {
+      "version": "1.0.0",
+      "from": "array-differ@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
+    },
+    "array-find-index": {
+      "version": "1.0.2",
+      "from": "array-find-index@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"
+    },
+    "array-flatten": {
+      "version": "1.1.1",
+      "from": "array-flatten@1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+    },
+    "array-slice": {
+      "version": "0.2.3",
+      "from": "array-slice@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"
+    },
+    "array-union": {
+      "version": "1.0.2",
+      "from": "array-union@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz"
+    },
+    "array-uniq": {
+      "version": "1.0.3",
+      "from": "array-uniq@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "from": "array-unique@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz"
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.6",
+      "from": "arraybuffer.slice@0.0.6",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz"
+    },
+    "arrify": {
+      "version": "1.0.1",
+      "from": "arrify@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+    },
+    "asap": {
+      "version": "2.0.5",
+      "from": "asap@>=2.0.3 <2.1.0",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "from": "asn1@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+    },
+    "assert": {
+      "version": "1.4.1",
+      "from": "assert@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"
+    },
+    "assert-plus": {
+      "version": "0.2.0",
+      "from": "assert-plus@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+    },
+    "async": {
+      "version": "1.5.2",
+      "from": "async@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "from": "async-each@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz"
+    },
+    "async-each-series": {
+      "version": "0.1.1",
+      "from": "async-each-series@0.1.1",
+      "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz"
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "from": "asynckit@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+    },
+    "autoprefixer": {
+      "version": "6.5.1",
+      "from": "autoprefixer@>=6.0.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.5.1.tgz"
+    },
+    "aws-sign2": {
+      "version": "0.6.0",
+      "from": "aws-sign2@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+    },
+    "aws4": {
+      "version": "1.5.0",
+      "from": "aws4@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"
+    },
+    "babel-code-frame": {
+      "version": "6.16.0",
+      "from": "babel-code-frame@>=6.16.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.16.0.tgz"
+    },
+    "babel-core": {
+      "version": "6.18.0",
+      "from": "babel-core@>=6.11.4 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "from": "source-map@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+        }
+      }
+    },
+    "babel-generator": {
+      "version": "6.18.0",
+      "from": "babel-generator@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "from": "source-map@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+        }
+      }
+    },
+    "babel-helper-call-delegate": {
+      "version": "6.18.0",
+      "from": "babel-helper-call-delegate@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.18.0.tgz"
+    },
+    "babel-helper-define-map": {
+      "version": "6.18.0",
+      "from": "babel-helper-define-map@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babel-helper-function-name": {
+      "version": "6.18.0",
+      "from": "babel-helper-function-name@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.18.0.tgz"
+    },
+    "babel-helper-get-function-arity": {
+      "version": "6.18.0",
+      "from": "babel-helper-get-function-arity@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.18.0.tgz"
+    },
+    "babel-helper-hoist-variables": {
+      "version": "6.18.0",
+      "from": "babel-helper-hoist-variables@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.18.0.tgz"
+    },
+    "babel-helper-optimise-call-expression": {
+      "version": "6.18.0",
+      "from": "babel-helper-optimise-call-expression@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.18.0.tgz"
+    },
+    "babel-helper-regex": {
+      "version": "6.18.0",
+      "from": "babel-helper-regex@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babel-helper-replace-supers": {
+      "version": "6.18.0",
+      "from": "babel-helper-replace-supers@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.18.0.tgz"
+    },
+    "babel-helpers": {
+      "version": "6.16.0",
+      "from": "babel-helpers@>=6.16.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.16.0.tgz"
+    },
+    "babel-messages": {
+      "version": "6.8.0",
+      "from": "babel-messages@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz"
+    },
+    "babel-plugin-check-es2015-constants": {
+      "version": "6.8.0",
+      "from": "babel-plugin-check-es2015-constants@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-arrow-functions": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-arrow-functions@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-block-scoped-functions": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-block-scoped-functions@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-block-scoping": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-block-scoping@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babel-plugin-transform-es2015-classes": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-classes@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-computed-properties": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-computed-properties@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-destructuring": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-destructuring@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-duplicate-keys": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-duplicate-keys@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-for-of": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-for-of@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-function-name": {
+      "version": "6.9.0",
+      "from": "babel-plugin-transform-es2015-function-name@>=6.9.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz"
+    },
+    "babel-plugin-transform-es2015-literals": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-literals@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-modules-amd": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-modules-amd@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-modules-commonjs": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-modules-commonjs@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-modules-systemjs": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-modules-systemjs@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-modules-umd": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-modules-umd@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-object-super": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-object-super@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-parameters": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-parameters@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-shorthand-properties": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-shorthand-properties@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-spread": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-spread@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-sticky-regex": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-sticky-regex@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-template-literals": {
+      "version": "6.8.0",
+      "from": "babel-plugin-transform-es2015-template-literals@>=6.6.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.8.0.tgz"
+    },
+    "babel-plugin-transform-es2015-typeof-symbol": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-es2015-typeof-symbol@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.18.0.tgz"
+    },
+    "babel-plugin-transform-es2015-unicode-regex": {
+      "version": "6.11.0",
+      "from": "babel-plugin-transform-es2015-unicode-regex@>=6.3.13 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz"
+    },
+    "babel-plugin-transform-regenerator": {
+      "version": "6.16.1",
+      "from": "babel-plugin-transform-regenerator@>=6.16.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.16.1.tgz"
+    },
+    "babel-plugin-transform-strict-mode": {
+      "version": "6.18.0",
+      "from": "babel-plugin-transform-strict-mode@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.18.0.tgz"
+    },
+    "babel-register": {
+      "version": "6.18.0",
+      "from": "babel-register@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babel-runtime": {
+      "version": "6.18.0",
+      "from": "babel-runtime@>=6.9.1 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.18.0.tgz"
+    },
+    "babel-template": {
+      "version": "6.16.0",
+      "from": "babel-template@>=6.16.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.16.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babel-traverse": {
+      "version": "6.18.0",
+      "from": "babel-traverse@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.18.0",
+      "from": "babel-types@>=6.18.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.18.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "babylon": {
+      "version": "6.13.1",
+      "from": "babylon@>=6.11.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.13.1.tgz"
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "from": "backo2@1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"
+    },
+    "balanced-match": {
+      "version": "0.4.2",
+      "from": "balanced-match@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+    },
+    "Base64": {
+      "version": "0.2.1",
+      "from": "Base64@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz"
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "from": "base64-arraybuffer@0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"
+    },
+    "base64-js": {
+      "version": "1.2.0",
+      "from": "base64-js@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"
+    },
+    "base64id": {
+      "version": "0.1.0",
+      "from": "base64id@0.1.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"
+    },
+    "batch": {
+      "version": "0.5.3",
+      "from": "batch@0.5.3",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.0",
+      "from": "bcrypt-pbkdf@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"
+    },
+    "beeper": {
+      "version": "1.1.0",
+      "from": "beeper@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
+    },
+    "benchmark": {
+      "version": "1.0.0",
+      "from": "benchmark@1.0.0",
+      "resolved": "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz"
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "from": "better-assert@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"
+    },
+    "big.js": {
+      "version": "3.1.3",
+      "from": "big.js@>=3.1.3 <4.0.0",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz"
+    },
+    "binary-extensions": {
+      "version": "1.7.0",
+      "from": "binary-extensions@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.7.0.tgz"
+    },
+    "binary-search": {
+      "version": "1.3.2",
+      "from": "binary-search@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/binary-search/-/binary-search-1.3.2.tgz"
+    },
+    "bindings": {
+      "version": "1.2.1",
+      "from": "bindings@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
+    },
+    "bl": {
+      "version": "1.0.3",
+      "from": "bl@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.5 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "blob": {
+      "version": "0.0.4",
+      "from": "blob@0.0.4",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz"
+    },
+    "bluebird": {
+      "version": "3.4.6",
+      "from": "bluebird@>=3.3.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"
+    },
+    "body-parser": {
+      "version": "1.14.2",
+      "from": "body-parser@>=1.14.0 <1.15.0",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.14.2.tgz",
+      "dependencies": {
+        "http-errors": {
+          "version": "1.3.1",
+          "from": "http-errors@>=1.3.1 <1.4.0",
+          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"
+        },
+        "qs": {
+          "version": "5.2.0",
+          "from": "qs@5.2.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz"
+        }
+      }
+    },
+    "boolbase": {
+      "version": "1.0.0",
+      "from": "boolbase@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+    },
+    "boom": {
+      "version": "2.10.1",
+      "from": "boom@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+    },
+    "bootstrap": {
+      "version": "3.3.7",
+      "from": "bootstrap@>=3.1.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz"
+    },
+    "bootstrap-datepicker": {
+      "version": "1.6.4",
+      "from": "bootstrap-datepicker@>=1.4.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/bootstrap-datepicker/-/bootstrap-datepicker-1.6.4.tgz"
+    },
+    "brace-expansion": {
+      "version": "1.1.6",
+      "from": "brace-expansion@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"
+    },
+    "braces": {
+      "version": "1.8.5",
+      "from": "braces@>=1.8.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"
+    },
+    "browser-sync": {
+      "version": "2.17.5",
+      "from": "browser-sync@>=2.14.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/browser-sync/-/browser-sync-2.17.5.tgz",
+      "dependencies": {
+        "cliui": {
+          "version": "3.2.0",
+          "from": "cliui@>=3.2.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
+        },
+        "qs": {
+          "version": "6.2.1",
+          "from": "qs@6.2.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"
+        },
+        "window-size": {
+          "version": "0.2.0",
+          "from": "window-size@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz"
+        },
+        "yargs": {
+          "version": "6.0.0",
+          "from": "yargs@6.0.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.0.0.tgz"
+        }
+      }
+    },
+    "browser-sync-client": {
+      "version": "2.4.3",
+      "from": "browser-sync-client@>=2.3.3 <3.0.0",
+      "resolved": "https://registry.npmjs.org/browser-sync-client/-/browser-sync-client-2.4.3.tgz"
+    },
+    "browser-sync-ui": {
+      "version": "0.6.1",
+      "from": "browser-sync-ui@0.6.1",
+      "resolved": "https://registry.npmjs.org/browser-sync-ui/-/browser-sync-ui-0.6.1.tgz"
+    },
+    "browserify-zlib": {
+      "version": "0.1.4",
+      "from": "browserify-zlib@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz"
+    },
+    "browserslist": {
+      "version": "1.4.0",
+      "from": "browserslist@>=1.4.0 <1.5.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.4.0.tgz"
+    },
+    "bs-recipes": {
+      "version": "1.2.3",
+      "from": "bs-recipes@1.2.3",
+      "resolved": "https://registry.npmjs.org/bs-recipes/-/bs-recipes-1.2.3.tgz"
+    },
+    "buffer": {
+      "version": "4.9.1",
+      "from": "buffer@>=4.9.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"
+    },
+    "buffer-crc32": {
+      "version": "0.2.5",
+      "from": "buffer-crc32@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
+    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "from": "buffer-shims@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+    },
+    "builtin-modules": {
+      "version": "1.1.1",
+      "from": "builtin-modules@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
+    },
+    "bytes": {
+      "version": "2.2.0",
+      "from": "bytes@2.2.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz"
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "from": "callsite@1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"
+    },
+    "camelcase": {
+      "version": "1.2.1",
+      "from": "camelcase@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+    },
+    "camelcase-keys": {
+      "version": "2.1.0",
+      "from": "camelcase-keys@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+      "dependencies": {
+        "camelcase": {
+          "version": "2.1.1",
+          "from": "camelcase@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"
+        }
+      }
+    },
+    "caniuse-db": {
+      "version": "1.0.30000568",
+      "from": "caniuse-db@>=1.0.30000554 <2.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000568.tgz"
+    },
+    "caseless": {
+      "version": "0.11.0",
+      "from": "caseless@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+    },
+    "center-align": {
+      "version": "0.1.3",
+      "from": "center-align@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "from": "chalk@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+    },
+    "cheerio": {
+      "version": "0.19.0",
+      "from": "cheerio@>=0.19.0 <0.20.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz"
+    },
+    "chokidar": {
+      "version": "1.6.0",
+      "from": "chokidar@1.6.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.0.tgz"
+    },
+    "cli": {
+      "version": "1.0.1",
+      "from": "cli@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.1.1 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+        }
+      }
+    },
+    "cli-width": {
+      "version": "1.1.1",
+      "from": "cli-width@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"
+    },
+    "cliui": {
+      "version": "2.1.0",
+      "from": "cliui@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz",
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "from": "wordwrap@0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+        }
+      }
+    },
+    "clone": {
+      "version": "1.0.2",
+      "from": "clone@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
+    },
+    "code-point-at": {
+      "version": "1.0.1",
+      "from": "code-point-at@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"
+    },
+    "codemirror": {
+      "version": "5.20.2",
+      "from": "codemirror@>=5.17.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.20.2.tgz"
+    },
+    "coffee-script": {
+      "version": "1.10.0",
+      "from": "coffee-script@>=1.10.0 <1.11.0",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"
+    },
+    "colors": {
+      "version": "1.1.2",
+      "from": "colors@>=1.1.2 <1.2.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "from": "combine-lists@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.5.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.5",
+      "from": "combined-stream@>=1.0.5 <1.1.0",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+    },
+    "commander": {
+      "version": "2.9.0",
+      "from": "commander@>=2.9.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+    },
+    "commondir": {
+      "version": "1.0.1",
+      "from": "commondir@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "from": "component-bind@1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"
+    },
+    "component-emitter": {
+      "version": "1.1.2",
+      "from": "component-emitter@1.1.2",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "from": "component-inherit@0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"
+    },
+    "components-font-awesome": {
+      "version": "4.7.0",
+      "from": "components-font-awesome@>=4.6.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/components-font-awesome/-/components-font-awesome-4.7.0.tgz"
+    },
+    "compress-commons": {
+      "version": "1.1.0",
+      "from": "compress-commons@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.1.0.tgz"
+    },
+    "compressible": {
+      "version": "2.0.8",
+      "from": "compressible@>=2.0.8 <2.1.0",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"
+    },
+    "compression": {
+      "version": "1.6.2",
+      "from": "compression@>=1.5.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.6.2.tgz",
+      "dependencies": {
+        "bytes": {
+          "version": "2.3.0",
+          "from": "bytes@2.3.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz"
+        }
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "from": "concat-map@0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+    },
+    "concat-stream": {
+      "version": "1.5.0",
+      "from": "concat-stream@1.5.0",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "connect": {
+      "version": "3.5.0",
+      "from": "connect@3.5.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"
+    },
+    "connect-history-api-fallback": {
+      "version": "1.3.0",
+      "from": "connect-history-api-fallback@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.3.0.tgz"
+    },
+    "console-browserify": {
+      "version": "1.1.0",
+      "from": "console-browserify@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz"
+    },
+    "constants-browserify": {
+      "version": "0.0.1",
+      "from": "constants-browserify@0.0.1",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz"
+    },
+    "content-disposition": {
+      "version": "0.5.1",
+      "from": "content-disposition@0.5.1",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz"
+    },
+    "content-type": {
+      "version": "1.0.2",
+      "from": "content-type@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"
+    },
+    "contextify": {
+      "version": "0.1.15",
+      "from": "contextify@>=0.1.5 <0.2.0",
+      "resolved": "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz"
+    },
+    "convert-source-map": {
+      "version": "1.3.0",
+      "from": "convert-source-map@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.3.0.tgz"
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "from": "cookie@0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"
+    },
+    "cookie-signature": {
+      "version": "1.0.6",
+      "from": "cookie-signature@1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
+    },
+    "core-js": {
+      "version": "2.4.1",
+      "from": "core-js@>=2.4.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz"
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "from": "core-util-is@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+    },
+    "crc32-stream": {
+      "version": "1.0.0",
+      "from": "crc32-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.0.tgz"
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "from": "cryptiles@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+    },
+    "crypto-browserify": {
+      "version": "3.2.8",
+      "from": "crypto-browserify@>=3.2.6 <3.3.0",
+      "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz"
+    },
+    "cson-parser": {
+      "version": "1.3.4",
+      "from": "cson-parser@>=1.0.9 <2.0.0",
+      "resolved": "https://registry.npmjs.org/cson-parser/-/cson-parser-1.3.4.tgz"
+    },
+    "css-select": {
+      "version": "1.0.0",
+      "from": "css-select@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz"
+    },
+    "css-what": {
+      "version": "1.0.0",
+      "from": "css-what@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz"
+    },
+    "cssom": {
+      "version": "0.2.5",
+      "from": "cssom@>=0.2.5 <0.3.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.2.5.tgz"
+    },
+    "cssstyle": {
+      "version": "0.2.37",
+      "from": "cssstyle@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz",
+      "dependencies": {
+        "cssom": {
+          "version": "0.3.1",
+          "from": "cssom@>=0.3.0 <0.4.0",
+          "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"
+        }
+      }
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "from": "ctype@0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"
+    },
+    "currently-unhandled": {
+      "version": "0.4.1",
+      "from": "currently-unhandled@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "from": "custom-event@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"
+    },
+    "d3": {
+      "version": "3.5.17",
+      "from": "d3@>=3.3.13 <4.0.0",
+      "resolved": "https://registry.npmjs.org/d3/-/d3-3.5.17.tgz"
+    },
+    "dashdash": {
+      "version": "1.14.0",
+      "from": "dashdash@>=1.12.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "date-now": {
+      "version": "0.1.4",
+      "from": "date-now@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz"
+    },
+    "date-time": {
+      "version": "1.1.0",
+      "from": "date-time@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/date-time/-/date-time-1.1.0.tgz"
+    },
+    "dateformat": {
+      "version": "1.0.12",
+      "from": "dateformat@>=1.0.12 <1.1.0",
+      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"
+    },
+    "debug": {
+      "version": "2.2.0",
+      "from": "debug@>=2.1.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "from": "decamelize@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "from": "deep-is@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "from": "delayed-stream@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+    },
+    "depd": {
+      "version": "1.1.0",
+      "from": "depd@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"
+    },
+    "destroy": {
+      "version": "1.0.4",
+      "from": "destroy@>=1.0.4 <1.1.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
+    },
+    "detect-indent": {
+      "version": "4.0.0",
+      "from": "detect-indent@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz"
+    },
+    "dev-ip": {
+      "version": "1.0.1",
+      "from": "dev-ip@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz"
+    },
+    "di": {
+      "version": "0.0.1",
+      "from": "di@>=0.0.1 <0.0.2",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "from": "dom-serialize@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"
+    },
+    "dom-serializer": {
+      "version": "0.1.0",
+      "from": "dom-serializer@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz",
+      "dependencies": {
+        "domelementtype": {
+          "version": "1.1.3",
+          "from": "domelementtype@>=1.1.1 <1.2.0",
+          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"
+        }
+      }
+    },
+    "domain-browser": {
+      "version": "1.1.7",
+      "from": "domain-browser@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz"
+    },
+    "domelementtype": {
+      "version": "1.3.0",
+      "from": "domelementtype@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"
+    },
+    "domhandler": {
+      "version": "2.3.0",
+      "from": "domhandler@>=2.3.0 <2.4.0",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"
+    },
+    "domutils": {
+      "version": "1.4.3",
+      "from": "domutils@>=1.4.0 <1.5.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz"
+    },
+    "duplexify": {
+      "version": "3.5.0",
+      "from": "duplexify@>=3.1.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz"
+    },
+    "easy-extender": {
+      "version": "2.3.2",
+      "from": "easy-extender@2.3.2",
+      "resolved": "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.2.tgz"
+    },
+    "eazy-logger": {
+      "version": "3.0.2",
+      "from": "eazy-logger@3.0.2",
+      "resolved": "https://registry.npmjs.org/eazy-logger/-/eazy-logger-3.0.2.tgz"
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "from": "ee-first@1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+    },
+    "emitter-steward": {
+      "version": "1.0.0",
+      "from": "emitter-steward@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/emitter-steward/-/emitter-steward-1.0.0.tgz"
+    },
+    "emojis-list": {
+      "version": "2.1.0",
+      "from": "emojis-list@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"
+    },
+    "encodeurl": {
+      "version": "1.0.1",
+      "from": "encodeurl@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"
+    },
+    "end-of-stream": {
+      "version": "1.0.0",
+      "from": "end-of-stream@1.0.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+      "dependencies": {
+        "once": {
+          "version": "1.3.3",
+          "from": "once@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
+        }
+      }
+    },
+    "engine.io": {
+      "version": "1.7.0",
+      "from": "engine.io@1.7.0",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-1.7.0.tgz"
+    },
+    "engine.io-client": {
+      "version": "1.7.0",
+      "from": "engine.io-client@1.7.0",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.7.0.tgz"
+    },
+    "engine.io-parser": {
+      "version": "1.3.0",
+      "from": "engine.io-parser@1.3.0",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.3.0.tgz",
+      "dependencies": {
+        "has-binary": {
+          "version": "0.1.6",
+          "from": "has-binary@0.1.6",
+          "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz"
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        }
+      }
+    },
+    "enhanced-resolve": {
+      "version": "0.9.1",
+      "from": "enhanced-resolve@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
+      "dependencies": {
+        "memory-fs": {
+          "version": "0.2.0",
+          "from": "memory-fs@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
+        }
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "from": "ent@>=2.2.0 <2.3.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
+    },
+    "entities": {
+      "version": "1.1.1",
+      "from": "entities@>=1.1.1 <1.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"
+    },
+    "errno": {
+      "version": "0.1.4",
+      "from": "errno@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz"
+    },
+    "error-ex": {
+      "version": "1.3.0",
+      "from": "error-ex@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"
+    },
+    "es6-promise": {
+      "version": "4.0.5",
+      "from": "es6-promise@>=4.0.3 <4.1.0",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz"
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "from": "escape-html@>=1.0.3 <1.1.0",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+    },
+    "escodegen": {
+      "version": "1.8.1",
+      "from": "escodegen@>=1.8.0 <1.9.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.2.0",
+          "from": "source-map@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"
+        }
+      }
+    },
+    "esprima": {
+      "version": "2.7.3",
+      "from": "esprima@>=2.6.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"
+    },
+    "estraverse": {
+      "version": "1.9.3",
+      "from": "estraverse@>=1.9.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "from": "esutils@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"
+    },
+    "etag": {
+      "version": "1.7.0",
+      "from": "etag@>=1.7.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"
+    },
+    "eventemitter2": {
+      "version": "0.4.14",
+      "from": "eventemitter2@>=0.4.13 <0.5.0",
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz"
+    },
+    "eventemitter3": {
+      "version": "1.2.0",
+      "from": "eventemitter3@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"
+    },
+    "events": {
+      "version": "1.1.1",
+      "from": "events@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz"
+    },
+    "eventsource": {
+      "version": "0.1.6",
+      "from": "eventsource@>=0.1.6 <0.2.0",
+      "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz"
+    },
+    "exit": {
+      "version": "0.1.2",
+      "from": "exit@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
+    },
+    "expand-braces": {
+      "version": "0.1.2",
+      "from": "expand-braces@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "dependencies": {
+        "braces": {
+          "version": "0.1.5",
+          "from": "braces@>=0.1.2 <0.2.0",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz"
+        },
+        "expand-range": {
+          "version": "0.1.1",
+          "from": "expand-range@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz"
+        },
+        "is-number": {
+          "version": "0.1.1",
+          "from": "is-number@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz"
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "from": "repeat-string@>=0.2.2 <0.3.0",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz"
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "from": "expand-brackets@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz"
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "from": "expand-range@>=1.8.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz"
+    },
+    "express": {
+      "version": "2.5.11",
+      "from": "express@>=2.5.0 <2.6.0",
+      "resolved": "https://registry.npmjs.org/express/-/express-2.5.11.tgz",
+      "dependencies": {
+        "connect": {
+          "version": "1.9.2",
+          "from": "connect@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "from": "mkdirp@0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"
+        },
+        "qs": {
+          "version": "0.4.2",
+          "from": "qs@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"
+        }
+      }
+    },
+    "extend": {
+      "version": "3.0.0",
+      "from": "extend@>=3.0.0 <3.1.0",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "from": "extglob@>=0.3.1 <0.4.0",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"
+    },
+    "extract-zip": {
+      "version": "1.5.0",
+      "from": "extract-zip@>=1.5.0 <1.6.0",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz",
+      "dependencies": {
+        "debug": {
+          "version": "0.7.4",
+          "from": "debug@0.7.4",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "from": "mkdirp@0.5.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"
+        }
+      }
+    },
+    "extsprintf": {
+      "version": "1.0.2",
+      "from": "extsprintf@1.0.2",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+    },
+    "fast-levenshtein": {
+      "version": "2.0.5",
+      "from": "fast-levenshtein@>=2.0.4 <2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"
+    },
+    "faye-websocket": {
+      "version": "0.10.0",
+      "from": "faye-websocket@>=0.10.0 <0.11.0",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "from": "fd-slicer@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"
+    },
+    "figures": {
+      "version": "1.7.0",
+      "from": "figures@>=1.3.5 <2.0.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"
+    },
+    "file-sync-cmp": {
+      "version": "0.1.1",
+      "from": "file-sync-cmp@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz"
+    },
+    "filename-regex": {
+      "version": "2.0.0",
+      "from": "filename-regex@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz"
+    },
+    "fileset": {
+      "version": "0.2.1",
+      "from": "fileset@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz",
+      "dependencies": {
+        "minimatch": {
+          "version": "2.0.10",
+          "from": "minimatch@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
+        }
+      }
+    },
+    "fill-range": {
+      "version": "2.2.3",
+      "from": "fill-range@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
+    },
+    "finalhandler": {
+      "version": "0.5.0",
+      "from": "finalhandler@0.5.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.0.tgz"
+    },
+    "find-cache-dir": {
+      "version": "0.1.1",
+      "from": "find-cache-dir@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz"
+    },
+    "find-up": {
+      "version": "1.1.2",
+      "from": "find-up@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
+    },
+    "findup-sync": {
+      "version": "0.3.0",
+      "from": "findup-sync@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz"
+    },
+    "for-in": {
+      "version": "0.1.6",
+      "from": "for-in@>=0.1.5 <0.2.0",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"
+    },
+    "for-own": {
+      "version": "0.1.4",
+      "from": "for-own@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz"
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "from": "forever-agent@>=0.6.1 <0.7.0",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+    },
+    "form-data": {
+      "version": "2.1.1",
+      "from": "form-data@>=2.1.1 <2.2.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.1.tgz"
+    },
+    "formidable": {
+      "version": "1.0.17",
+      "from": "formidable@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"
+    },
+    "forwarded": {
+      "version": "0.1.0",
+      "from": "forwarded@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"
+    },
+    "fresh": {
+      "version": "0.3.0",
+      "from": "fresh@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"
+    },
+    "fs": {
+      "version": "0.0.2",
+      "from": "fs@0.0.2",
+      "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.2.tgz"
+    },
+    "fs-access": {
+      "version": "1.0.1",
+      "from": "fs-access@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz"
+    },
+    "fs-extra": {
+      "version": "0.30.0",
+      "from": "fs-extra@0.30.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz"
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "from": "fs.realpath@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+    },
+    "fsevents": {
+      "version": "1.0.14",
+      "from": "fsevents@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.0.14.tgz",
+      "dependencies": {
+        "abbrev": {
+          "version": "1.0.9",
+          "from": "abbrev@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz"
+        },
+        "ansi-regex": {
+          "version": "2.0.0",
+          "from": "ansi-regex@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
+        },
+        "ansi-styles": {
+          "version": "2.2.1",
+          "from": "ansi-styles@>=2.2.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
+        },
+        "aproba": {
+          "version": "1.0.4",
+          "from": "aproba@>=1.0.3 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"
+        },
+        "are-we-there-yet": {
+          "version": "1.1.2",
+          "from": "are-we-there-yet@>=1.1.2 <1.2.0",
+          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz"
+        },
+        "asn1": {
+          "version": "0.2.3",
+          "from": "asn1@>=0.2.3 <0.3.0",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"
+        },
+        "assert-plus": {
+          "version": "0.2.0",
+          "from": "assert-plus@>=0.2.0 <0.3.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"
+        },
+        "async": {
+          "version": "1.5.2",
+          "from": "async@>=1.5.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "from": "aws-sign2@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
+        },
+        "aws4": {
+          "version": "1.4.1",
+          "from": "aws4@>=1.2.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"
+        },
+        "balanced-match": {
+          "version": "0.4.2",
+          "from": "balanced-match@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"
+        },
+        "bl": {
+          "version": "1.1.2",
+          "from": "bl@>=1.1.2 <1.2.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+          "dependencies": {
+            "readable-stream": {
+              "version": "2.0.6",
+              "from": "readable-stream@>=2.0.5 <2.1.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+            }
+          }
+        },
+        "block-stream": {
+          "version": "0.0.9",
+          "from": "block-stream@*",
+          "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
+        },
+        "boom": {
+          "version": "2.10.1",
+          "from": "boom@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
+        },
+        "brace-expansion": {
+          "version": "1.1.5",
+          "from": "brace-expansion@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.5.tgz"
+        },
+        "buffer-shims": {
+          "version": "1.0.0",
+          "from": "buffer-shims@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "from": "caseless@>=0.11.0 <0.12.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"
+        },
+        "chalk": {
+          "version": "1.1.3",
+          "from": "chalk@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
+        },
+        "code-point-at": {
+          "version": "1.0.0",
+          "from": "code-point-at@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"
+        },
+        "combined-stream": {
+          "version": "1.0.5",
+          "from": "combined-stream@>=1.0.5 <1.1.0",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"
+        },
+        "commander": {
+          "version": "2.9.0",
+          "from": "commander@>=2.9.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz"
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "from": "concat-map@0.0.1",
+          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "from": "console-control-strings@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "from": "core-util-is@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+        },
+        "cryptiles": {
+          "version": "2.0.5",
+          "from": "cryptiles@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"
+        },
+        "dashdash": {
+          "version": "1.14.0",
+          "from": "dashdash@>=1.12.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+            }
+          }
+        },
+        "debug": {
+          "version": "2.2.0",
+          "from": "debug@>=2.2.0 <2.3.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
+        },
+        "deep-extend": {
+          "version": "0.4.1",
+          "from": "deep-extend@>=0.4.0 <0.5.0",
+          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz"
+        },
+        "delayed-stream": {
+          "version": "1.0.0",
+          "from": "delayed-stream@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "from": "delegates@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+        },
+        "ecc-jsbn": {
+          "version": "0.1.1",
+          "from": "ecc-jsbn@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
+        },
+        "escape-string-regexp": {
+          "version": "1.0.5",
+          "from": "escape-string-regexp@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
+        },
+        "extend": {
+          "version": "3.0.0",
+          "from": "extend@>=3.0.0 <3.1.0",
+          "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"
+        },
+        "extsprintf": {
+          "version": "1.0.2",
+          "from": "extsprintf@1.0.2",
+          "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"
+        },
+        "forever-agent": {
+          "version": "0.6.1",
+          "from": "forever-agent@>=0.6.1 <0.7.0",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+        },
+        "form-data": {
+          "version": "1.0.0-rc4",
+          "from": "form-data@>=1.0.0-rc4 <1.1.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "from": "fs.realpath@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+        },
+        "fstream": {
+          "version": "1.0.10",
+          "from": "fstream@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.10.tgz"
+        },
+        "fstream-ignore": {
+          "version": "1.0.5",
+          "from": "fstream-ignore@>=1.0.5 <1.1.0",
+          "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz"
+        },
+        "gauge": {
+          "version": "2.6.0",
+          "from": "gauge@>=2.6.0 <2.7.0",
+          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.6.0.tgz"
+        },
+        "generate-function": {
+          "version": "2.0.0",
+          "from": "generate-function@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+        },
+        "generate-object-property": {
+          "version": "1.2.0",
+          "from": "generate-object-property@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+        },
+        "getpass": {
+          "version": "0.1.6",
+          "from": "getpass@>=0.1.1 <0.2.0",
+          "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+            }
+          }
+        },
+        "glob": {
+          "version": "7.0.5",
+          "from": "glob@>=7.0.5 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"
+        },
+        "graceful-fs": {
+          "version": "4.1.4",
+          "from": "graceful-fs@>=4.1.2 <5.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz"
+        },
+        "graceful-readlink": {
+          "version": "1.0.1",
+          "from": "graceful-readlink@>=1.0.0",
+          "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "from": "har-validator@>=2.0.6 <2.1.0",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
+        },
+        "has-ansi": {
+          "version": "2.0.0",
+          "from": "has-ansi@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+        },
+        "has-color": {
+          "version": "0.1.7",
+          "from": "has-color@>=0.1.7 <0.2.0",
+          "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz"
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "from": "has-unicode@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
+        },
+        "hawk": {
+          "version": "3.1.3",
+          "from": "hawk@>=3.1.3 <3.2.0",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+        },
+        "hoek": {
+          "version": "2.16.3",
+          "from": "hoek@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "from": "http-signature@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
+        },
+        "inflight": {
+          "version": "1.0.5",
+          "from": "inflight@>=1.0.4 <2.0.0",
+          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"
+        },
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@>=2.0.1 <2.1.0",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+        },
+        "ini": {
+          "version": "1.3.4",
+          "from": "ini@>=1.3.0 <1.4.0",
+          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+        },
+        "is-my-json-valid": {
+          "version": "2.13.1",
+          "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+          "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"
+        },
+        "is-property": {
+          "version": "1.0.2",
+          "from": "is-property@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+        },
+        "is-typedarray": {
+          "version": "1.0.0",
+          "from": "is-typedarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "from": "isarray@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+        },
+        "isstream": {
+          "version": "0.1.2",
+          "from": "isstream@>=0.1.2 <0.2.0",
+          "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+        },
+        "jodid25519": {
+          "version": "1.0.2",
+          "from": "jodid25519@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+        },
+        "jsbn": {
+          "version": "0.1.0",
+          "from": "jsbn@>=0.1.0 <0.2.0",
+          "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+        },
+        "json-schema": {
+          "version": "0.2.2",
+          "from": "json-schema@0.2.2",
+          "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"
+        },
+        "json-stringify-safe": {
+          "version": "5.0.1",
+          "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+          "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+        },
+        "jsonpointer": {
+          "version": "2.0.0",
+          "from": "jsonpointer@2.0.0",
+          "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"
+        },
+        "jsprim": {
+          "version": "1.3.0",
+          "from": "jsprim@>=1.2.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"
+        },
+        "mime-db": {
+          "version": "1.23.0",
+          "from": "mime-db@>=1.23.0 <1.24.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
+        },
+        "mime-types": {
+          "version": "2.1.11",
+          "from": "mime-types@>=2.1.7 <2.2.0",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
+        },
+        "minimatch": {
+          "version": "3.0.2",
+          "from": "minimatch@>=3.0.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.2.tgz"
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "from": "minimist@0.0.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "from": "mkdirp@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+        },
+        "ms": {
+          "version": "0.7.1",
+          "from": "ms@0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+        },
+        "node-pre-gyp": {
+          "version": "0.6.29",
+          "from": "node-pre-gyp@>=0.6.29 <0.7.0",
+          "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.29.tgz"
+        },
+        "node-uuid": {
+          "version": "1.4.7",
+          "from": "node-uuid@>=1.4.7 <1.5.0",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+        },
+        "nopt": {
+          "version": "3.0.6",
+          "from": "nopt@>=3.0.1 <3.1.0",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
+        },
+        "npmlog": {
+          "version": "3.1.2",
+          "from": "npmlog@>=3.1.2 <3.2.0",
+          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-3.1.2.tgz"
+        },
+        "number-is-nan": {
+          "version": "1.0.0",
+          "from": "number-is-nan@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
+        },
+        "oauth-sign": {
+          "version": "0.8.2",
+          "from": "oauth-sign@>=0.8.1 <0.9.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
+        },
+        "object-assign": {
+          "version": "4.1.0",
+          "from": "object-assign@>=4.1.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
+        },
+        "once": {
+          "version": "1.3.3",
+          "from": "once@>=1.3.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
+        },
+        "path-is-absolute": {
+          "version": "1.0.0",
+          "from": "path-is-absolute@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"
+        },
+        "pinkie": {
+          "version": "2.0.4",
+          "from": "pinkie@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+        },
+        "pinkie-promise": {
+          "version": "2.0.1",
+          "from": "pinkie-promise@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+        },
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "from": "process-nextick-args@>=1.0.6 <1.1.0",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+        },
+        "qs": {
+          "version": "6.2.0",
+          "from": "qs@>=6.2.0 <6.3.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz"
+        },
+        "rc": {
+          "version": "1.1.6",
+          "from": "rc@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz",
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "from": "minimist@>=1.2.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.1.4",
+          "from": "readable-stream@>=2.0.0 <3.0.0||>=1.1.13 <2.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
+        },
+        "request": {
+          "version": "2.73.0",
+          "from": "request@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.73.0.tgz"
+        },
+        "rimraf": {
+          "version": "2.5.3",
+          "from": "rimraf@>=2.5.0 <2.6.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.3.tgz"
+        },
+        "semver": {
+          "version": "5.2.0",
+          "from": "semver@>=5.2.0 <5.3.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.2.0.tgz"
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "from": "set-blocking@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+        },
+        "signal-exit": {
+          "version": "3.0.0",
+          "from": "signal-exit@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"
+        },
+        "sntp": {
+          "version": "1.0.9",
+          "from": "sntp@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+        },
+        "sshpk": {
+          "version": "1.8.3",
+          "from": "sshpk@>=1.7.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
+          "dependencies": {
+            "assert-plus": {
+              "version": "1.0.0",
+              "from": "assert-plus@>=1.0.0 <2.0.0",
+              "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+            }
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "from": "string_decoder@>=0.10.0 <0.11.0",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+        },
+        "string-width": {
+          "version": "1.0.1",
+          "from": "string-width@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz"
+        },
+        "stringstream": {
+          "version": "0.0.5",
+          "from": "stringstream@>=0.0.4 <0.1.0",
+          "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "from": "strip-ansi@>=3.0.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+        },
+        "strip-json-comments": {
+          "version": "1.0.4",
+          "from": "strip-json-comments@>=1.0.4 <1.1.0",
+          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
+        },
+        "supports-color": {
+          "version": "2.0.0",
+          "from": "supports-color@>=2.0.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+        },
+        "tar": {
+          "version": "2.2.1",
+          "from": "tar@>=2.2.0 <2.3.0",
+          "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
+        },
+        "tar-pack": {
+          "version": "3.1.4",
+          "from": "tar-pack@>=3.1.0 <3.2.0",
+          "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.4.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.2.2",
+          "from": "tough-cookie@>=2.2.0 <2.3.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "from": "tunnel-agent@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+        },
+        "tweetnacl": {
+          "version": "0.13.3",
+          "from": "tweetnacl@>=0.13.0 <0.14.0",
+          "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
+        },
+        "uid-number": {
+          "version": "0.0.6",
+          "from": "uid-number@>=0.0.6 <0.1.0",
+          "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz"
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "from": "util-deprecate@>=1.0.1 <1.1.0",
+          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+        },
+        "verror": {
+          "version": "1.3.6",
+          "from": "verror@1.3.6",
+          "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+        },
+        "wide-align": {
+          "version": "1.1.0",
+          "from": "wide-align@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.0.tgz"
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "from": "wrappy@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+        },
+        "xtend": {
+          "version": "4.0.1",
+          "from": "xtend@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+        }
+      }
+    },
+    "gaze": {
+      "version": "1.1.2",
+      "from": "gaze@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.2.tgz"
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "from": "generate-function@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz"
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "from": "generate-object-property@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz"
+    },
+    "get-caller-file": {
+      "version": "1.0.2",
+      "from": "get-caller-file@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"
+    },
+    "get-stdin": {
+      "version": "4.0.1",
+      "from": "get-stdin@>=4.0.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
+    },
+    "getobject": {
+      "version": "0.1.0",
+      "from": "getobject@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
+    },
+    "getpass": {
+      "version": "0.1.6",
+      "from": "getpass@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "glob": {
+      "version": "5.0.15",
+      "from": "glob@>=5.0.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz"
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "from": "glob-base@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz"
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "from": "glob-parent@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz"
+    },
+    "globals": {
+      "version": "9.12.0",
+      "from": "globals@>=9.0.0 <10.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.12.0.tgz"
+    },
+    "globule": {
+      "version": "1.1.0",
+      "from": "globule@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/globule/-/globule-1.1.0.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.1.1 <7.2.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+        },
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.16.4 <4.17.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.9",
+      "from": "graceful-fs@>=4.1.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "from": "graceful-readlink@>=1.0.0",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"
+    },
+    "grunt-cli": {
+      "version": "1.2.0",
+      "from": "grunt-cli@>=1.2.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz"
+    },
+    "grunt-known-options": {
+      "version": "1.1.0",
+      "from": "grunt-known-options@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz"
+    },
+    "grunt-legacy-log": {
+      "version": "1.0.0",
+      "from": "grunt-legacy-log@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-1.0.0.tgz"
+    },
+    "grunt-legacy-log-utils": {
+      "version": "1.0.0",
+      "from": "grunt-legacy-log-utils@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-1.0.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.3.0",
+          "from": "lodash@>=4.3.0 <4.4.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz"
+        }
+      }
+    },
+    "grunt-legacy-util": {
+      "version": "1.0.0",
+      "from": "grunt-legacy-util@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.0.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.3.0",
+          "from": "lodash@>=4.3.0 <4.4.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz"
+        }
+      }
+    },
+    "handlebars": {
+      "version": "4.0.5",
+      "from": "handlebars@>=4.0.0 <4.1.0",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "from": "source-map@>=0.4.4 <0.5.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
+        }
+      }
+    },
+    "har-validator": {
+      "version": "2.0.6",
+      "from": "har-validator@>=2.0.6 <2.1.0",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "from": "has-ansi@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
+    },
+    "has-binary": {
+      "version": "0.1.7",
+      "from": "has-binary@0.1.7",
+      "resolved": "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "from": "has-cors@1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"
+    },
+    "has-flag": {
+      "version": "1.0.0",
+      "from": "has-flag@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
+    },
+    "hasha": {
+      "version": "2.2.0",
+      "from": "hasha@>=2.2.0 <2.3.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz"
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "from": "hawk@>=3.1.3 <3.2.0",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "from": "hoek@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"
+    },
+    "home-or-tmp": {
+      "version": "2.0.0",
+      "from": "home-or-tmp@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"
+    },
+    "hooker": {
+      "version": "0.2.3",
+      "from": "hooker@>=0.2.3 <0.3.0",
+      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
+    },
+    "hosted-git-info": {
+      "version": "2.1.5",
+      "from": "hosted-git-info@>=2.1.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"
+    },
+    "htmlparser": {
+      "version": "1.7.7",
+      "from": "htmlparser@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/htmlparser/-/htmlparser-1.7.7.tgz"
+    },
+    "htmlparser2": {
+      "version": "3.8.3",
+      "from": "htmlparser2@>=3.8.1 <3.9.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
+      "dependencies": {
+        "domutils": {
+          "version": "1.5.1",
+          "from": "domutils@>=1.5.0 <1.6.0",
+          "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"
+        },
+        "entities": {
+          "version": "1.0.0",
+          "from": "entities@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz"
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "from": "readable-stream@>=1.1.0 <1.2.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
+        }
+      }
+    },
+    "http-browserify": {
+      "version": "1.7.0",
+      "from": "http-browserify@>=1.3.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz"
+    },
+    "http-errors": {
+      "version": "1.5.0",
+      "from": "http-errors@>=1.5.0 <1.6.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.0.tgz",
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+        }
+      }
+    },
+    "http-proxy": {
+      "version": "1.15.1",
+      "from": "http-proxy@1.15.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"
+    },
+    "http-proxy-middleware": {
+      "version": "0.17.2",
+      "from": "http-proxy-middleware@>=0.17.1 <0.18.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.2.tgz",
+      "dependencies": {
+        "is-extglob": {
+          "version": "2.1.0",
+          "from": "is-extglob@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.0.tgz"
+        },
+        "is-glob": {
+          "version": "3.1.0",
+          "from": "is-glob@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
+        },
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.16.2 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.1.1",
+      "from": "http-signature@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
+    },
+    "https-browserify": {
+      "version": "0.0.0",
+      "from": "https-browserify@0.0.0",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz"
+    },
+    "https-proxy-agent": {
+      "version": "1.0.0",
+      "from": "https-proxy-agent@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"
+    },
+    "iconv-lite": {
+      "version": "0.4.13",
+      "from": "iconv-lite@>=0.4.13 <0.5.0",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
+    },
+    "ieee754": {
+      "version": "1.1.8",
+      "from": "ieee754@>=1.1.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz"
+    },
+    "image-size": {
+      "version": "0.5.0",
+      "from": "image-size@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.0.tgz"
+    },
+    "immutable": {
+      "version": "3.8.1",
+      "from": "immutable@3.8.1",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.8.1.tgz"
+    },
+    "indent-string": {
+      "version": "2.1.0",
+      "from": "indent-string@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "from": "indexof@0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "from": "inflight@>=1.0.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "from": "inherits@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+    },
+    "inquirer": {
+      "version": "0.8.5",
+      "from": "inquirer@>=0.8.2 <0.9.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz",
+      "dependencies": {
+        "ansi-regex": {
+          "version": "1.1.1",
+          "from": "ansi-regex@>=1.1.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+        },
+        "rx": {
+          "version": "2.5.3",
+          "from": "rx@>=2.4.3 <3.0.0",
+          "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz"
+        }
+      }
+    },
+    "interpret": {
+      "version": "0.6.6",
+      "from": "interpret@>=0.6.4 <0.7.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
+    },
+    "invariant": {
+      "version": "2.2.1",
+      "from": "invariant@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.1.tgz"
+    },
+    "invert-kv": {
+      "version": "1.0.0",
+      "from": "invert-kv@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
+    },
+    "ipaddr.js": {
+      "version": "1.1.1",
+      "from": "ipaddr.js@1.1.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz"
+    },
+    "irregular-plurals": {
+      "version": "1.2.0",
+      "from": "irregular-plurals@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.2.0.tgz"
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "from": "is-arrayish@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "from": "is-binary-path@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
+    },
+    "is-buffer": {
+      "version": "1.1.4",
+      "from": "is-buffer@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
+    },
+    "is-builtin-module": {
+      "version": "1.0.0",
+      "from": "is-builtin-module@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
+    },
+    "is-dotfile": {
+      "version": "1.0.2",
+      "from": "is-dotfile@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz"
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "from": "is-equal-shallow@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz"
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "from": "is-extendable@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "from": "is-extglob@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
+    },
+    "is-finite": {
+      "version": "1.0.2",
+      "from": "is-finite@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"
+    },
+    "is-fullwidth-code-point": {
+      "version": "1.0.0",
+      "from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "from": "is-glob@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz"
+    },
+    "is-my-json-valid": {
+      "version": "2.15.0",
+      "from": "is-my-json-valid@>=2.12.4 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz"
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "from": "is-number@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz"
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "from": "is-posix-bracket@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz"
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "from": "is-primitive@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "from": "is-property@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "from": "is-stream@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "from": "is-typedarray@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+    },
+    "is-utf8": {
+      "version": "0.2.1",
+      "from": "is-utf8@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "from": "isarray@1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+    },
+    "isbinaryfile": {
+      "version": "3.0.1",
+      "from": "isbinaryfile@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.1.tgz"
+    },
+    "isexe": {
+      "version": "1.1.2",
+      "from": "isexe@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "from": "isobject@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "from": "isstream@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+    },
+    "istanbul": {
+      "version": "0.4.5",
+      "from": "istanbul@>=0.4.0 <0.5.0",
+      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
+      "dependencies": {
+        "supports-color": {
+          "version": "3.1.2",
+          "from": "supports-color@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
+        }
+      }
+    },
+    "istanbul-lib-coverage": {
+      "version": "1.0.0",
+      "from": "istanbul-lib-coverage@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz"
+    },
+    "istanbul-lib-instrument": {
+      "version": "1.2.0",
+      "from": "istanbul-lib-instrument@>=1.1.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.2.0.tgz"
+    },
+    "javascript-detect-element-resize": {
+      "version": "0.5.3",
+      "from": "javascript-detect-element-resize@>=0.5.3 <0.6.0",
+      "resolved": "https://registry.npmjs.org/javascript-detect-element-resize/-/javascript-detect-element-resize-0.5.3.tgz"
+    },
+    "jodid25519": {
+      "version": "1.0.2",
+      "from": "jodid25519@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
+    },
+    "jquery": {
+      "version": "2.2.4",
+      "from": "jquery@2.2.4",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz"
+    },
+    "jquery-mousewheel": {
+      "version": "3.1.13",
+      "from": "jquery-mousewheel@>=3.1.13 <3.2.0",
+      "resolved": "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz"
+    },
+    "jquery-ui": {
+      "version": "1.10.5",
+      "from": "jquery-ui@1.10.5",
+      "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.10.5.tgz"
+    },
+    "js-base64": {
+      "version": "2.1.9",
+      "from": "js-base64@>=2.1.9 <3.0.0",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz"
+    },
+    "js-tokens": {
+      "version": "2.0.0",
+      "from": "js-tokens@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-2.0.0.tgz"
+    },
+    "js-yaml": {
+      "version": "3.6.1",
+      "from": "js-yaml@>=3.2.7 <4.0.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"
+    },
+    "jsbn": {
+      "version": "0.1.0",
+      "from": "jsbn@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"
+    },
+    "jsdom": {
+      "version": "0.5.7",
+      "from": "jsdom@0.5.7",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-0.5.7.tgz"
+    },
+    "jsesc": {
+      "version": "1.3.0",
+      "from": "jsesc@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz"
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "from": "json-schema@0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "from": "json-stringify-safe@>=5.0.1 <5.1.0",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+    },
+    "json3": {
+      "version": "3.2.6",
+      "from": "json3@3.2.6",
+      "resolved": "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz"
+    },
+    "json5": {
+      "version": "0.5.0",
+      "from": "json5@>=0.5.0 <0.6.0",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz"
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "from": "jsonfile@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"
+    },
+    "jsonpointer": {
+      "version": "4.0.0",
+      "from": "jsonpointer@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz"
+    },
+    "jsprim": {
+      "version": "1.3.1",
+      "from": "jsprim@>=1.2.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"
+    },
+    "jstimezonedetect": {
+      "version": "1.0.5",
+      "from": "jstimezonedetect@1.0.5",
+      "resolved": "https://registry.npmjs.org/jstimezonedetect/-/jstimezonedetect-1.0.5.tgz"
+    },
+    "kew": {
+      "version": "0.7.0",
+      "from": "kew@>=0.7.0 <0.8.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"
+    },
+    "kind-of": {
+      "version": "3.0.4",
+      "from": "kind-of@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.4.tgz"
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "from": "klaw@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
+    },
+    "lazy-cache": {
+      "version": "1.0.4",
+      "from": "lazy-cache@>=1.0.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
+    },
+    "lazy.js": {
+      "version": "0.4.2",
+      "from": "lazy.js@>=0.4.2 <0.5.0",
+      "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.2.tgz"
+    },
+    "lazystream": {
+      "version": "1.0.0",
+      "from": "lazystream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"
+    },
+    "lcid": {
+      "version": "1.0.0",
+      "from": "lcid@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
+    },
+    "legacy-loader": {
+      "version": "0.0.2",
+      "from": "legacy-loader@0.0.2",
+      "resolved": "https://registry.npmjs.org/legacy-loader/-/legacy-loader-0.0.2.tgz"
+    },
+    "less": {
+      "version": "2.7.1",
+      "from": "less@>=2.7.1 <2.8.0",
+      "resolved": "https://registry.npmjs.org/less/-/less-2.7.1.tgz",
+      "dependencies": {
+        "mime": {
+          "version": "1.3.4",
+          "from": "mime@>=1.2.11 <2.0.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "from": "source-map@>=0.5.3 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+        }
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "from": "levn@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
+    },
+    "limiter": {
+      "version": "1.1.0",
+      "from": "limiter@>=1.0.5 <2.0.0",
+      "resolved": "https://registry.npmjs.org/limiter/-/limiter-1.1.0.tgz"
+    },
+    "livereload-js": {
+      "version": "2.2.2",
+      "from": "livereload-js@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz"
+    },
+    "load-json-file": {
+      "version": "1.1.0",
+      "from": "load-json-file@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
+    },
+    "loader-utils": {
+      "version": "0.2.16",
+      "from": "loader-utils@>=0.2.6 <0.3.0",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"
+    },
+    "localtunnel": {
+      "version": "1.8.1",
+      "from": "localtunnel@1.8.1",
+      "resolved": "https://registry.npmjs.org/localtunnel/-/localtunnel-1.8.1.tgz",
+      "dependencies": {
+        "asn1": {
+          "version": "0.1.11",
+          "from": "asn1@0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz"
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "from": "assert-plus@>=0.1.5 <0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"
+        },
+        "async": {
+          "version": "2.1.2",
+          "from": "async@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.1.2.tgz"
+        },
+        "cliui": {
+          "version": "3.2.0",
+          "from": "cliui@>=3.0.3 <4.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
+        },
+        "form-data": {
+          "version": "1.0.1",
+          "from": "form-data@>=1.0.0-rc3 <1.1.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"
+        },
+        "http-signature": {
+          "version": "0.11.0",
+          "from": "http-signature@>=0.11.0 <0.12.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz"
+        },
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.14.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        },
+        "qs": {
+          "version": "5.2.1",
+          "from": "qs@>=5.2.0 <5.3.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-5.2.1.tgz"
+        },
+        "request": {
+          "version": "2.65.0",
+          "from": "request@2.65.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.65.0.tgz"
+        },
+        "tough-cookie": {
+          "version": "2.2.2",
+          "from": "tough-cookie@>=2.2.0 <2.3.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"
+        },
+        "window-size": {
+          "version": "0.1.4",
+          "from": "window-size@>=0.1.2 <0.2.0",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"
+        },
+        "yargs": {
+          "version": "3.29.0",
+          "from": "yargs@3.29.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.29.0.tgz"
+        }
+      }
+    },
+    "lodash": {
+      "version": "3.10.1",
+      "from": "lodash@>=3.8.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
+    },
+    "lodash._isnative": {
+      "version": "2.4.1",
+      "from": "lodash._isnative@>=2.4.1 <2.5.0",
+      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz"
+    },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "from": "lodash.clonedeep@>=4.3.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"
+    },
+    "lodash.isarray": {
+      "version": "2.4.1",
+      "from": "lodash.isarray@>=2.4.1 <2.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-2.4.1.tgz"
+    },
+    "log-symbols": {
+      "version": "1.0.2",
+      "from": "log-symbols@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"
+    },
+    "log4js": {
+      "version": "0.6.38",
+      "from": "log4js@>=0.6.31 <0.7.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-0.6.38.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "from": "readable-stream@>=1.0.2 <1.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
+        },
+        "semver": {
+          "version": "4.3.6",
+          "from": "semver@>=4.3.3 <4.4.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
+        }
+      }
+    },
+    "longest": {
+      "version": "1.0.1",
+      "from": "longest@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
+    },
+    "loose-envify": {
+      "version": "1.2.0",
+      "from": "loose-envify@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.2.0.tgz",
+      "dependencies": {
+        "js-tokens": {
+          "version": "1.0.3",
+          "from": "js-tokens@>=1.0.1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.3.tgz"
+        }
+      }
+    },
+    "loud-rejection": {
+      "version": "1.6.0",
+      "from": "loud-rejection@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"
+    },
+    "lr-infinite-scroll": {
+      "version": "1.0.0",
+      "from": "lorenzofox3/lrInfiniteScroll",
+      "resolved": "git://github.com/lorenzofox3/lrInfiniteScroll.git#59d348bc5c18f164438d2a30f1fd79b333c3b649"
+    },
+    "lru-cache": {
+      "version": "2.2.4",
+      "from": "lru-cache@>=2.2.0 <2.3.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz"
+    },
+    "map-obj": {
+      "version": "1.0.1",
+      "from": "map-obj@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "from": "media-typer@0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+    },
+    "memory-fs": {
+      "version": "0.3.0",
+      "from": "memory-fs@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz"
+    },
+    "meow": {
+      "version": "3.7.0",
+      "from": "meow@>=3.3.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "from": "minimist@>=1.1.3 <2.0.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
+        }
+      }
+    },
+    "merge-descriptors": {
+      "version": "1.0.1",
+      "from": "merge-descriptors@1.0.1",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+    },
+    "methods": {
+      "version": "1.1.2",
+      "from": "methods@>=1.1.2 <1.2.0",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "from": "micromatch@>=2.3.11 <3.0.0",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
+    },
+    "mime": {
+      "version": "1.2.4",
+      "from": "mime@1.2.4",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"
+    },
+    "mime-db": {
+      "version": "1.24.0",
+      "from": "mime-db@>=1.24.0 <1.25.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"
+    },
+    "mime-types": {
+      "version": "2.1.12",
+      "from": "mime-types@>=2.1.7 <2.2.0",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"
+    },
+    "minimatch": {
+      "version": "3.0.3",
+      "from": "minimatch@>=3.0.2 <4.0.0",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "from": "minimist@0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "from": "mkdirp@>=0.5.1 <0.6.0",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+    },
+    "moment": {
+      "version": "2.15.2",
+      "from": "moment@>=2.10.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.15.2.tgz"
+    },
+    "ms": {
+      "version": "0.7.1",
+      "from": "ms@0.7.1",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"
+    },
+    "multimatch": {
+      "version": "2.1.0",
+      "from": "multimatch@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz"
+    },
+    "mute-stream": {
+      "version": "0.0.4",
+      "from": "mute-stream@0.0.4",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz"
+    },
+    "nan": {
+      "version": "2.4.0",
+      "from": "nan@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "from": "negotiator@0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"
+    },
+    "ng-toast": {
+      "version": "2.0.0",
+      "from": "leigh-johnson/ngToast#2.0.1",
+      "resolved": "git://github.com/leigh-johnson/ngToast.git#fea95bb34d27687e414619b4f72c11735d909f93"
+    },
+    "node-libs-browser": {
+      "version": "0.6.0",
+      "from": "node-libs-browser@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.6.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "from": "readable-stream@>=1.1.13 <2.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
+        }
+      }
+    },
+    "node-uuid": {
+      "version": "1.4.7",
+      "from": "node-uuid@>=1.4.7 <1.5.0",
+      "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"
+    },
+    "nopt": {
+      "version": "3.0.6",
+      "from": "nopt@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
+    },
+    "normalize-package-data": {
+      "version": "2.3.5",
+      "from": "normalize-package-data@>=2.3.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"
+    },
+    "normalize-path": {
+      "version": "2.0.1",
+      "from": "normalize-path@>=2.0.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
+    },
+    "normalize-range": {
+      "version": "0.1.2",
+      "from": "normalize-range@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
+    },
+    "nth-check": {
+      "version": "1.0.1",
+      "from": "nth-check@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz"
+    },
+    "null-check": {
+      "version": "1.0.0",
+      "from": "null-check@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz"
+    },
+    "num2fraction": {
+      "version": "1.2.2",
+      "from": "num2fraction@>=1.2.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
+    },
+    "number-is-nan": {
+      "version": "1.0.1",
+      "from": "number-is-nan@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
+    },
+    "nvd3": {
+      "version": "1.7.1",
+      "from": "leigh-johnson/nvd3#1.7.1",
+      "resolved": "git://github.com/leigh-johnson/nvd3.git#a28bcd494a1df0677be7cf2ebc0578f44eb21102",
+      "dependencies": {
+        "d3": {
+          "version": "3.3.13",
+          "from": "d3@>=3.3.13 <3.4.0",
+          "resolved": "https://registry.npmjs.org/d3/-/d3-3.3.13.tgz"
+        }
+      }
+    },
+    "nwmatcher": {
+      "version": "1.3.9",
+      "from": "nwmatcher@>=1.3.1 <1.4.0",
+      "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "from": "oauth-sign@>=0.8.1 <0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
+    },
+    "object-assign": {
+      "version": "4.1.0",
+      "from": "object-assign@>=4.0.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "from": "object-component@0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"
+    },
+    "object-path": {
+      "version": "0.9.2",
+      "from": "object-path@>=0.9.0 <0.10.0",
+      "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.9.2.tgz"
+    },
+    "object.omit": {
+      "version": "2.0.0",
+      "from": "object.omit@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz"
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "from": "on-finished@>=2.3.0 <2.4.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
+    },
+    "on-headers": {
+      "version": "1.0.1",
+      "from": "on-headers@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"
+    },
+    "once": {
+      "version": "1.4.0",
+      "from": "once@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+    },
+    "open": {
+      "version": "0.0.5",
+      "from": "open@0.0.5",
+      "resolved": "https://registry.npmjs.org/open/-/open-0.0.5.tgz"
+    },
+    "openurl": {
+      "version": "1.1.0",
+      "from": "openurl@1.1.0",
+      "resolved": "https://registry.npmjs.org/openurl/-/openurl-1.1.0.tgz"
+    },
+    "opn": {
+      "version": "4.0.2",
+      "from": "opn@4.0.2",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "from": "optimist@>=0.6.1 <0.7.0",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "from": "wordwrap@>=0.0.2 <0.1.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "from": "optionator@>=0.8.1 <0.9.0",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"
+    },
+    "options": {
+      "version": "0.0.6",
+      "from": "options@>=0.0.5",
+      "resolved": "https://registry.npmjs.org/options/-/options-0.0.6.tgz"
+    },
+    "original": {
+      "version": "1.0.0",
+      "from": "original@>=0.0.5",
+      "resolved": "https://registry.npmjs.org/original/-/original-1.0.0.tgz",
+      "dependencies": {
+        "url-parse": {
+          "version": "1.0.5",
+          "from": "url-parse@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.0.5.tgz"
+        }
+      }
+    },
+    "os-browserify": {
+      "version": "0.1.2",
+      "from": "os-browserify@>=0.1.2 <0.2.0",
+      "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
+    },
+    "os-homedir": {
+      "version": "1.0.2",
+      "from": "os-homedir@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
+    },
+    "os-locale": {
+      "version": "1.4.0",
+      "from": "os-locale@>=1.4.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "from": "os-tmpdir@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
+    },
+    "pad-stream": {
+      "version": "1.2.0",
+      "from": "pad-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pad-stream/-/pad-stream-1.2.0.tgz"
+    },
+    "pako": {
+      "version": "0.2.9",
+      "from": "pako@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "from": "parse-glob@>=3.0.4 <4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz"
+    },
+    "parse-json": {
+      "version": "2.2.0",
+      "from": "parse-json@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
+    },
+    "parse-ms": {
+      "version": "1.0.1",
+      "from": "parse-ms@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-1.0.1.tgz"
+    },
+    "parsejson": {
+      "version": "0.0.1",
+      "from": "parsejson@0.0.1",
+      "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz"
+    },
+    "parseqs": {
+      "version": "0.0.2",
+      "from": "parseqs@0.0.2",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz"
+    },
+    "parseuri": {
+      "version": "0.0.4",
+      "from": "parseuri@0.0.4",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz"
+    },
+    "parseurl": {
+      "version": "1.3.1",
+      "from": "parseurl@>=1.3.1 <1.4.0",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"
+    },
+    "path-browserify": {
+      "version": "0.0.0",
+      "from": "path-browserify@0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
+    },
+    "path-exists": {
+      "version": "2.1.0",
+      "from": "path-exists@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "from": "path-is-absolute@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
+    },
+    "path-to-regexp": {
+      "version": "0.1.7",
+      "from": "path-to-regexp@0.1.7",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+    },
+    "path-type": {
+      "version": "1.1.0",
+      "from": "path-type@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
+    },
+    "pbkdf2-compat": {
+      "version": "2.0.1",
+      "from": "pbkdf2-compat@2.0.1",
+      "resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"
+    },
+    "pend": {
+      "version": "1.2.0",
+      "from": "pend@>=1.2.0 <1.3.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
+    },
+    "phantomjs-prebuilt": {
+      "version": "2.1.13",
+      "from": "phantomjs-prebuilt@>=2.1.12 <3.0.0",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.13.tgz",
+      "dependencies": {
+        "async": {
+          "version": "2.1.2",
+          "from": "async@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.1.2.tgz"
+        },
+        "bl": {
+          "version": "1.1.2",
+          "from": "bl@>=1.1.2 <1.2.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"
+        },
+        "form-data": {
+          "version": "1.0.1",
+          "from": "form-data@>=1.0.0-rc4 <1.1.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"
+        },
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.14.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        },
+        "qs": {
+          "version": "6.2.1",
+          "from": "qs@>=6.2.0 <6.3.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.5 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        },
+        "request": {
+          "version": "2.74.0",
+          "from": "request@>=2.74.0 <2.75.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.74.0.tgz"
+        }
+      }
+    },
+    "pify": {
+      "version": "2.3.0",
+      "from": "pify@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "from": "pinkie@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "from": "pinkie-promise@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
+    },
+    "pkg-dir": {
+      "version": "1.0.0",
+      "from": "pkg-dir@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz"
+    },
+    "pkg-up": {
+      "version": "1.0.0",
+      "from": "pkg-up@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-1.0.0.tgz"
+    },
+    "plur": {
+      "version": "2.1.2",
+      "from": "plur@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz"
+    },
+    "pofile": {
+      "version": "1.0.2",
+      "from": "pofile@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/pofile/-/pofile-1.0.2.tgz"
+    },
+    "portscanner": {
+      "version": "1.0.0",
+      "from": "portscanner@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-1.0.0.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.1.15",
+          "from": "async@0.1.15",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.1.15.tgz"
+        }
+      }
+    },
+    "postcss": {
+      "version": "5.2.5",
+      "from": "postcss@>=5.0.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.5.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.6",
+          "from": "source-map@>=0.5.6 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+        },
+        "supports-color": {
+          "version": "3.1.2",
+          "from": "supports-color@>=3.1.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
+        }
+      }
+    },
+    "postcss-value-parser": {
+      "version": "3.3.0",
+      "from": "postcss-value-parser@>=3.2.3 <4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "from": "prelude-ls@>=1.1.2 <1.2.0",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "from": "preserve@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz"
+    },
+    "pretty-ms": {
+      "version": "2.1.0",
+      "from": "pretty-ms@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-2.1.0.tgz",
+      "dependencies": {
+        "plur": {
+          "version": "1.0.0",
+          "from": "plur@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz"
+        }
+      }
+    },
+    "private": {
+      "version": "0.1.6",
+      "from": "private@>=0.1.6 <0.2.0",
+      "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz"
+    },
+    "process": {
+      "version": "0.11.9",
+      "from": "process@>=0.11.0 <0.12.0",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.9.tgz"
+    },
+    "process-nextick-args": {
+      "version": "1.0.7",
+      "from": "process-nextick-args@>=1.0.6 <1.1.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
+    },
+    "progress": {
+      "version": "1.1.8",
+      "from": "progress@>=1.1.8 <1.2.0",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz"
+    },
+    "promise": {
+      "version": "7.1.1",
+      "from": "promise@>=7.1.1 <8.0.0",
+      "resolved": "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz"
+    },
+    "proxy-addr": {
+      "version": "1.1.2",
+      "from": "proxy-addr@>=1.1.2 <1.2.0",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.2.tgz"
+    },
+    "prr": {
+      "version": "0.0.0",
+      "from": "prr@>=0.0.0 <0.1.0",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
+    },
+    "pump": {
+      "version": "1.0.1",
+      "from": "pump@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz",
+      "dependencies": {
+        "end-of-stream": {
+          "version": "1.1.0",
+          "from": "end-of-stream@>=1.1.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
+          "dependencies": {
+            "once": {
+              "version": "1.3.3",
+              "from": "once@>=1.3.0 <1.4.0",
+              "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz"
+            }
+          }
+        }
+      }
+    },
+    "pumpify": {
+      "version": "1.3.5",
+      "from": "pumpify@>=1.3.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.3.5.tgz"
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "from": "punycode@>=1.4.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"
+    },
+    "q": {
+      "version": "1.4.1",
+      "from": "q@>=1.4.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz"
+    },
+    "qjobs": {
+      "version": "1.1.5",
+      "from": "qjobs@>=1.1.4 <2.0.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.1.5.tgz"
+    },
+    "qs": {
+      "version": "6.3.0",
+      "from": "qs@>=6.3.0 <6.4.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz"
+    },
+    "querystring": {
+      "version": "0.2.0",
+      "from": "querystring@0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"
+    },
+    "querystring-es3": {
+      "version": "0.2.1",
+      "from": "querystring-es3@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
+    },
+    "querystringify": {
+      "version": "0.0.4",
+      "from": "querystringify@>=0.0.0 <0.1.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-0.0.4.tgz"
+    },
+    "randomatic": {
+      "version": "1.1.5",
+      "from": "randomatic@>=1.1.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "from": "range-parser@>=1.2.0 <1.3.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz"
+    },
+    "raw-body": {
+      "version": "2.1.7",
+      "from": "raw-body@>=2.1.5 <2.2.0",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
+      "dependencies": {
+        "bytes": {
+          "version": "2.4.0",
+          "from": "bytes@2.4.0",
+          "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"
+        }
+      }
+    },
+    "rcfinder": {
+      "version": "0.1.9",
+      "from": "rcfinder@>=0.1.6 <0.2.0",
+      "resolved": "https://registry.npmjs.org/rcfinder/-/rcfinder-0.1.9.tgz"
+    },
+    "rcloader": {
+      "version": "0.1.2",
+      "from": "rcloader@0.1.2",
+      "resolved": "https://registry.npmjs.org/rcloader/-/rcloader-0.1.2.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "2.4.2",
+          "from": "lodash@>=2.4.1 <2.5.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"
+        }
+      }
+    },
+    "read-pkg": {
+      "version": "1.1.0",
+      "from": "read-pkg@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
+    },
+    "read-pkg-up": {
+      "version": "1.0.1",
+      "from": "read-pkg-up@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
+    },
+    "readable-stream": {
+      "version": "2.1.5",
+      "from": "readable-stream@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "from": "readdirp@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz"
+    },
+    "readline2": {
+      "version": "0.1.1",
+      "from": "readline2@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
+      "dependencies": {
+        "ansi-regex": {
+          "version": "1.1.1",
+          "from": "ansi-regex@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz"
+        },
+        "strip-ansi": {
+          "version": "2.0.1",
+          "from": "strip-ansi@>=2.0.1 <3.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz"
+        }
+      }
+    },
+    "reconnectingwebsocket": {
+      "version": "1.0.0",
+      "from": "reconnectingwebsocket@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/reconnectingwebsocket/-/reconnectingwebsocket-1.0.0.tgz"
+    },
+    "redent": {
+      "version": "1.0.0",
+      "from": "redent@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"
+    },
+    "regenerate": {
+      "version": "1.3.1",
+      "from": "regenerate@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.1.tgz"
+    },
+    "regenerator-runtime": {
+      "version": "0.9.5",
+      "from": "regenerator-runtime@>=0.9.5 <0.10.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz"
+    },
+    "regex-cache": {
+      "version": "0.4.3",
+      "from": "regex-cache@>=0.4.2 <0.5.0",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz"
+    },
+    "regexpu-core": {
+      "version": "2.0.0",
+      "from": "regexpu-core@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz"
+    },
+    "regjsgen": {
+      "version": "0.2.0",
+      "from": "regjsgen@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz"
+    },
+    "regjsparser": {
+      "version": "0.1.5",
+      "from": "regjsparser@>=0.1.4 <0.2.0",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz",
+      "dependencies": {
+        "jsesc": {
+          "version": "0.5.0",
+          "from": "jsesc@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+        }
+      }
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "from": "repeat-element@>=1.1.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz"
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "from": "repeat-string@>=1.5.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
+    },
+    "repeating": {
+      "version": "2.0.1",
+      "from": "repeating@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"
+    },
+    "request": {
+      "version": "2.76.0",
+      "from": "request@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.76.0.tgz"
+    },
+    "request-progress": {
+      "version": "2.0.1",
+      "from": "request-progress@>=2.0.1 <2.1.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz"
+    },
+    "require-directory": {
+      "version": "2.1.1",
+      "from": "require-directory@>=2.1.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+    },
+    "require-main-filename": {
+      "version": "1.0.1",
+      "from": "require-main-filename@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "from": "requires-port@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
+    },
+    "resolve": {
+      "version": "1.1.7",
+      "from": "resolve@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz"
+    },
+    "resolve-from": {
+      "version": "2.0.0",
+      "from": "resolve-from@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"
+    },
+    "resolve-pkg": {
+      "version": "0.1.0",
+      "from": "resolve-pkg@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg/-/resolve-pkg-0.1.0.tgz"
+    },
+    "resp-modifier": {
+      "version": "6.0.2",
+      "from": "resp-modifier@6.0.2",
+      "resolved": "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"
+    },
+    "right-align": {
+      "version": "0.1.3",
+      "from": "right-align@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"
+    },
+    "rimraf": {
+      "version": "2.5.4",
+      "from": "rimraf@>=2.2.8 <3.0.0",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.1.1",
+          "from": "glob@>=7.0.5 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
+        }
+      }
+    },
+    "ripemd160": {
+      "version": "0.2.0",
+      "from": "ripemd160@0.2.0",
+      "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
+    },
+    "rrule": {
+      "version": "2.2.0-dev",
+      "from": "jkbrzt/rrule#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c",
+      "resolved": "git://github.com/jkbrzt/rrule.git#4ff63b2f8524fd6d5ba6e80db770953b5cd08a0c"
+    },
+    "rx": {
+      "version": "4.1.0",
+      "from": "rx@4.1.0",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-4.1.0.tgz"
+    },
+    "sauce-connect-launcher": {
+      "version": "0.17.0",
+      "from": "sauce-connect-launcher@>=0.17.0 <0.18.0",
+      "resolved": "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.17.0.tgz",
+      "dependencies": {
+        "async": {
+          "version": "1.4.0",
+          "from": "async@1.4.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.4.0.tgz"
+        },
+        "rimraf": {
+          "version": "2.4.3",
+          "from": "rimraf@2.4.3",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz"
+        }
+      }
+    },
+    "saucelabs": {
+      "version": "1.3.0",
+      "from": "saucelabs@>=1.3.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.3.0.tgz"
+    },
+    "select2": {
+      "version": "4.0.3",
+      "from": "select2@>=4.0.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/select2/-/select2-4.0.3.tgz"
+    },
+    "semver": {
+      "version": "5.3.0",
+      "from": "semver@>=5.3.0 <6.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
+    },
+    "send": {
+      "version": "0.14.1",
+      "from": "send@0.14.1",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.14.1.tgz",
+      "dependencies": {
+        "mime": {
+          "version": "1.3.4",
+          "from": "mime@1.3.4",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+        }
+      }
+    },
+    "serve-index": {
+      "version": "1.8.0",
+      "from": "serve-index@1.8.0",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.8.0.tgz"
+    },
+    "serve-static": {
+      "version": "1.11.1",
+      "from": "serve-static@1.11.1",
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.1.tgz"
+    },
+    "server-destroy": {
+      "version": "1.0.1",
+      "from": "server-destroy@1.0.1",
+      "resolved": "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"
+    },
+    "set-blocking": {
+      "version": "2.0.0",
+      "from": "set-blocking@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "from": "set-immediate-shim@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz"
+    },
+    "setprototypeof": {
+      "version": "1.0.1",
+      "from": "setprototypeof@1.0.1",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.1.tgz"
+    },
+    "sha.js": {
+      "version": "2.2.6",
+      "from": "sha.js@2.2.6",
+      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"
+    },
+    "shelljs": {
+      "version": "0.3.0",
+      "from": "shelljs@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz"
+    },
+    "signal-exit": {
+      "version": "3.0.1",
+      "from": "signal-exit@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"
+    },
+    "slash": {
+      "version": "1.0.0",
+      "from": "slash@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "from": "sntp@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
+    },
+    "socket.io": {
+      "version": "1.5.0",
+      "from": "socket.io@1.5.0",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-1.5.0.tgz"
+    },
+    "socket.io-adapter": {
+      "version": "0.4.0",
+      "from": "socket.io-adapter@0.4.0",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
+        "socket.io-parser": {
+          "version": "2.2.2",
+          "from": "socket.io-parser@2.2.2",
+          "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz",
+          "dependencies": {
+            "debug": {
+              "version": "0.7.4",
+              "from": "debug@0.7.4",
+              "resolved": "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"
+            }
+          }
+        }
+      }
+    },
+    "socket.io-client": {
+      "version": "1.5.0",
+      "from": "socket.io-client@1.5.0",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.5.0.tgz",
+      "dependencies": {
+        "component-emitter": {
+          "version": "1.2.0",
+          "from": "component-emitter@1.2.0",
+          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz"
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "2.2.6",
+      "from": "socket.io-parser@2.2.6",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
+        "json3": {
+          "version": "3.3.2",
+          "from": "json3@3.3.2",
+          "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"
+        }
+      }
+    },
+    "sockjs": {
+      "version": "0.3.18",
+      "from": "sockjs@>=0.3.15 <0.4.0",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz"
+    },
+    "sockjs-client": {
+      "version": "1.1.1",
+      "from": "sockjs-client@>=1.0.3 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.1.tgz",
+      "dependencies": {
+        "faye-websocket": {
+          "version": "0.11.0",
+          "from": "faye-websocket@>=0.11.0 <0.12.0",
+          "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"
+        },
+        "json3": {
+          "version": "3.3.2",
+          "from": "json3@>=3.3.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz"
+        }
+      }
+    },
+    "source-list-map": {
+      "version": "0.1.6",
+      "from": "source-list-map@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz"
+    },
+    "source-map": {
+      "version": "0.3.0",
+      "from": "source-map@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz"
+    },
+    "source-map-support": {
+      "version": "0.4.5",
+      "from": "source-map-support@>=0.4.2 <0.5.0",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.5.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.5.6",
+          "from": "source-map@>=0.5.3 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+        }
+      }
+    },
+    "spdx-correct": {
+      "version": "1.0.2",
+      "from": "spdx-correct@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
+    },
+    "spdx-expression-parse": {
+      "version": "1.0.4",
+      "from": "spdx-expression-parse@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"
+    },
+    "spdx-license-ids": {
+      "version": "1.2.2",
+      "from": "spdx-license-ids@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"
+    },
+    "split2": {
+      "version": "1.1.1",
+      "from": "split2@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-1.1.1.tgz"
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "from": "sprintf-js@>=1.0.2 <1.1.0",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
+    },
+    "sshpk": {
+      "version": "1.10.1",
+      "from": "sshpk@>=1.7.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
+    "statuses": {
+      "version": "1.3.0",
+      "from": "statuses@>=1.3.0 <1.4.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"
+    },
+    "stream-browserify": {
+      "version": "1.0.0",
+      "from": "stream-browserify@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "from": "readable-stream@>=1.0.27-1 <2.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
+        }
+      }
+    },
+    "stream-cache": {
+      "version": "0.0.2",
+      "from": "stream-cache@>=0.0.1 <0.1.0",
+      "resolved": "https://registry.npmjs.org/stream-cache/-/stream-cache-0.0.2.tgz"
+    },
+    "stream-shift": {
+      "version": "1.0.0",
+      "from": "stream-shift@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz"
+    },
+    "stream-throttle": {
+      "version": "0.1.3",
+      "from": "stream-throttle@>=0.1.3 <0.2.0",
+      "resolved": "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz"
+    },
+    "string_decoder": {
+      "version": "0.10.31",
+      "from": "string_decoder@>=0.10.0 <0.11.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
+    },
+    "string-length": {
+      "version": "1.0.1",
+      "from": "string-length@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz"
+    },
+    "string-width": {
+      "version": "1.0.2",
+      "from": "string-width@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
+    },
+    "stringstream": {
+      "version": "0.0.5",
+      "from": "stringstream@>=0.0.4 <0.1.0",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "from": "strip-ansi@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
+    },
+    "strip-bom": {
+      "version": "2.0.0",
+      "from": "strip-bom@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
+    },
+    "strip-indent": {
+      "version": "1.0.1",
+      "from": "strip-indent@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"
+    },
+    "strip-json-comments": {
+      "version": "1.0.4",
+      "from": "strip-json-comments@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz"
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "from": "supports-color@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
+    },
+    "tapable": {
+      "version": "0.1.10",
+      "from": "tapable@>=0.1.8 <0.2.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
+    },
+    "tar-stream": {
+      "version": "1.5.2",
+      "from": "tar-stream@>=1.5.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz"
+    },
+    "test-exclude": {
+      "version": "2.1.3",
+      "from": "test-exclude@>=2.1.1 <3.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-2.1.3.tgz"
+    },
+    "text-table": {
+      "version": "0.2.0",
+      "from": "text-table@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+    },
+    "tfunk": {
+      "version": "3.0.2",
+      "from": "tfunk@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/tfunk/-/tfunk-3.0.2.tgz"
+    },
+    "throttleit": {
+      "version": "1.0.0",
+      "from": "throttleit@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"
+    },
+    "through": {
+      "version": "2.3.8",
+      "from": "through@>=2.3.6 <3.0.0",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+    },
+    "through2": {
+      "version": "2.0.1",
+      "from": "through2@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
+    },
+    "time-zone": {
+      "version": "0.1.0",
+      "from": "time-zone@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-0.1.0.tgz"
+    },
+    "timers-browserify": {
+      "version": "1.4.2",
+      "from": "timers-browserify@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz"
+    },
+    "timezone-js": {
+      "version": "0.4.11",
+      "from": "leigh-johnson/timezone-js#0.4.13",
+      "resolved": "git://github.com/leigh-johnson/timezone-js.git#3b1de3f89106706483e79831312d3c325f95dd8a"
+    },
+    "tiny-lr": {
+      "version": "0.2.1",
+      "from": "tiny-lr@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.2.1.tgz",
+      "dependencies": {
+        "qs": {
+          "version": "5.1.0",
+          "from": "qs@>=5.1.0 <5.2.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz"
+        }
+      }
+    },
+    "tmp": {
+      "version": "0.0.28",
+      "from": "tmp@0.0.28",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz"
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "from": "to-array@0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"
+    },
+    "to-fast-properties": {
+      "version": "1.0.2",
+      "from": "to-fast-properties@>=1.0.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.2.tgz"
+    },
+    "tough-cookie": {
+      "version": "2.3.2",
+      "from": "tough-cookie@>=2.3.0 <2.4.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"
+    },
+    "trim-newlines": {
+      "version": "1.0.0",
+      "from": "trim-newlines@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"
+    },
+    "tty-browserify": {
+      "version": "0.0.0",
+      "from": "tty-browserify@0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"
+    },
+    "tunnel-agent": {
+      "version": "0.4.3",
+      "from": "tunnel-agent@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+    },
+    "tweetnacl": {
+      "version": "0.14.3",
+      "from": "tweetnacl@>=0.14.0 <0.15.0",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "from": "type-check@>=0.3.2 <0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
+    },
+    "type-is": {
+      "version": "1.6.13",
+      "from": "type-is@>=1.6.10 <1.7.0",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "from": "typedarray@>=0.0.5 <0.1.0",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
+    },
+    "ua-parser-js": {
+      "version": "0.7.10",
+      "from": "ua-parser-js@0.7.10",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz"
+    },
+    "uglify-js": {
+      "version": "2.7.4",
+      "from": "uglify-js@>=2.6.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "from": "async@>=0.2.6 <0.3.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
+        },
+        "source-map": {
+          "version": "0.5.6",
+          "from": "source-map@>=0.5.1 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
+        }
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
+    },
+    "ultron": {
+      "version": "1.0.2",
+      "from": "ultron@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"
+    },
+    "underscore": {
+      "version": "1.7.0",
+      "from": "underscore@>=1.7.0 <1.8.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz"
+    },
+    "underscore.string": {
+      "version": "3.2.3",
+      "from": "underscore.string@>=3.2.3 <3.3.0",
+      "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.2.3.tgz"
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "from": "unpipe@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+    },
+    "url": {
+      "version": "0.10.3",
+      "from": "url@>=0.10.1 <0.11.0",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "dependencies": {
+        "punycode": {
+          "version": "1.3.2",
+          "from": "punycode@1.3.2",
+          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"
+        }
+      }
+    },
+    "url-parse": {
+      "version": "1.1.6",
+      "from": "url-parse@>=1.1.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.1.6.tgz"
+    },
+    "useragent": {
+      "version": "2.1.9",
+      "from": "useragent@>=2.1.9 <3.0.0",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz"
+    },
+    "utf8": {
+      "version": "2.1.0",
+      "from": "utf8@2.1.0",
+      "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz"
+    },
+    "util": {
+      "version": "0.10.3",
+      "from": "util@>=0.10.3 <0.11.0",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+      "dependencies": {
+        "inherits": {
+          "version": "2.0.1",
+          "from": "inherits@2.0.1",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "from": "util-deprecate@>=1.0.1 <1.1.0",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+    },
+    "utils-merge": {
+      "version": "1.0.0",
+      "from": "utils-merge@1.0.0",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
+    },
+    "uuid": {
+      "version": "2.0.3",
+      "from": "uuid@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"
+    },
+    "validate-npm-package-license": {
+      "version": "3.0.1",
+      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
+    },
+    "vargs": {
+      "version": "0.1.0",
+      "from": "vargs@0.1.0",
+      "resolved": "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz"
+    },
+    "vary": {
+      "version": "1.1.0",
+      "from": "vary@>=1.1.0 <1.2.0",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"
+    },
+    "verror": {
+      "version": "1.3.6",
+      "from": "verror@1.3.6",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"
+    },
+    "vm-browserify": {
+      "version": "0.0.4",
+      "from": "vm-browserify@0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "from": "void-elements@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
+    },
+    "watchpack": {
+      "version": "0.2.9",
+      "from": "watchpack@>=0.2.1 <0.3.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
+      "dependencies": {
+        "async": {
+          "version": "0.9.2",
+          "from": "async@>=0.9.0 <0.10.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
+        }
+      }
+    },
+    "wd": {
+      "version": "1.0.0",
+      "from": "wd@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/wd/-/wd-1.0.0.tgz",
+      "dependencies": {
+        "async": {
+          "version": "2.0.1",
+          "from": "async@2.0.1",
+          "resolved": "https://registry.npmjs.org/async/-/async-2.0.1.tgz"
+        },
+        "bl": {
+          "version": "1.1.2",
+          "from": "bl@>=1.1.2 <1.2.0",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"
+        },
+        "form-data": {
+          "version": "2.0.0",
+          "from": "form-data@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"
+        },
+        "lodash": {
+          "version": "4.16.2",
+          "from": "lodash@4.16.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz"
+        },
+        "qs": {
+          "version": "6.2.1",
+          "from": "qs@>=6.2.0 <6.3.0",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.5 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        },
+        "request": {
+          "version": "2.75.0",
+          "from": "request@2.75.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz"
+        },
+        "underscore.string": {
+          "version": "3.3.4",
+          "from": "underscore.string@3.3.4",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz"
+        }
+      }
+    },
+    "webpack-core": {
+      "version": "0.6.8",
+      "from": "webpack-core@>=0.6.0 <0.7.0",
+      "resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz",
+      "dependencies": {
+        "source-map": {
+          "version": "0.4.4",
+          "from": "source-map@>=0.4.1 <0.5.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
+        }
+      }
+    },
+    "webpack-dev-middleware": {
+      "version": "1.8.4",
+      "from": "webpack-dev-middleware@>=1.0.11 <2.0.0",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.8.4.tgz",
+      "dependencies": {
+        "mime": {
+          "version": "1.3.4",
+          "from": "mime@>=1.3.4 <2.0.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
+        }
+      }
+    },
+    "websocket-driver": {
+      "version": "0.6.5",
+      "from": "websocket-driver@>=0.5.1",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"
+    },
+    "websocket-extensions": {
+      "version": "0.1.1",
+      "from": "websocket-extensions@>=0.1.1",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"
+    },
+    "weinre": {
+      "version": "2.0.0-pre-I0Z7U9OV",
+      "from": "weinre@>=2.0.0-pre-I0Z7U9OV <3.0.0",
+      "resolved": "https://registry.npmjs.org/weinre/-/weinre-2.0.0-pre-I0Z7U9OV.tgz"
+    },
+    "which": {
+      "version": "1.2.11",
+      "from": "which@>=1.2.0 <1.3.0",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.2.11.tgz"
+    },
+    "which-module": {
+      "version": "1.0.0",
+      "from": "which-module@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "from": "window-size@0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "from": "wordwrap@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
+    },
+    "wrap-ansi": {
+      "version": "2.0.0",
+      "from": "wrap-ansi@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "from": "wrappy@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
+    },
+    "ws": {
+      "version": "1.1.1",
+      "from": "ws@1.1.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-1.1.1.tgz"
+    },
+    "wtf-8": {
+      "version": "1.0.0",
+      "from": "wtf-8@1.0.0",
+      "resolved": "https://registry.npmjs.org/wtf-8/-/wtf-8-1.0.0.tgz"
+    },
+    "xmlbuilder": {
+      "version": "8.2.2",
+      "from": "xmlbuilder@8.2.2",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz"
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.1",
+      "from": "xmlhttprequest-ssl@1.5.1",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz"
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "from": "xtend@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
+    },
+    "y18n": {
+      "version": "3.2.1",
+      "from": "y18n@>=3.2.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"
+    },
+    "yargs": {
+      "version": "3.10.0",
+      "from": "yargs@>=3.10.0 <3.11.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
+    },
+    "yargs-parser": {
+      "version": "4.0.2",
+      "from": "yargs-parser@>=4.0.2 <5.0.0",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.0.2.tgz",
+      "dependencies": {
+        "camelcase": {
+          "version": "3.0.0",
+          "from": "camelcase@>=3.0.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
+        }
+      }
+    },
+    "yauzl": {
+      "version": "2.4.1",
+      "from": "yauzl@2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "from": "yeast@0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"
+    },
+    "zip-stream": {
+      "version": "1.1.0",
+      "from": "zip-stream@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.16.4",
+          "from": "lodash@>=4.8.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.16.4.tgz"
+        }
+      }
+    }
+  }
+}

From 2c8d29513276ebe7ff5128b25dd018a786da97ed Mon Sep 17 00:00:00 2001
From: Leigh Johnson 
Date: Wed, 26 Oct 2016 16:51:39 -0400
Subject: [PATCH 19/21] UI Build System - new interface

Use `make ui-devel` to build a development/debug version of the  UI, with source maps,
without raising any additional browser-sync or filesystem polling.
---
 Makefile                         |  6 +++++-
 awx/ui/Gruntfile.js              | 13 +++++++++++--
 awx/ui/grunt-tasks/concurrent.js |  4 ++++
 awx/ui/package.json              |  5 +++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index a9df006bc4..a4b38e1cf6 100644
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,7 @@ UI_RELEASE_FLAG_FILE = awx/ui/.release_built
 	deb deb-src debian debsign pbuilder reprepro setup_tarball \
 	virtualbox-ovf virtualbox-centos-7 virtualbox-centos-6 \
 	clean-bundle setup_bundle_tarball \
-	ui-docker-machine ui-docker ui-release \
+	ui-docker-machine ui-docker ui-release ui-devel \
 	ui-test ui-deps ui-test-ci ui-test-saucelabs jlaska
 
 
@@ -555,6 +555,10 @@ ui-docker-machine: $(UI_DEPS_FLAG_FILE)
 ui-docker: $(UI_DEPS_FLAG_FILE)
 	$(NPM_BIN) --prefix awx/ui run build-docker-cid
 
+# Builds UI with development/debug settings enabled. Does not raise browser-sync or filesystem polling.
+ui-devel: $(UI_DEPS_FLAG_FILE)
+	$(NPM_BIN) --prefix awx/ui run build-devel
+
 ui-release: $(UI_RELEASE_FLAG_FILE)
 
 # todo: include languages target when .po deliverables are added to source control
diff --git a/awx/ui/Gruntfile.js b/awx/ui/Gruntfile.js
index 16b61f0405..a118409568 100644
--- a/awx/ui/Gruntfile.js
+++ b/awx/ui/Gruntfile.js
@@ -21,12 +21,21 @@ module.exports = function(grunt) {
     // writes environment variables for development. current manages:
     // browser-sync + websocket proxy
 
+    grunt.registerTask('sync', [
+        'browserSync:http',
+        'concurrent:watch'
+    ]);
+
     grunt.registerTask('dev', [
         'clean:tmp',
         'clean:static',
         'concurrent:dev',
-        'browserSync:http',
-        'concurrent:watch'
+    ]);
+
+    grunt.registerTask('devNoSync', [
+        'clean:tmp',
+        'clean:static',
+        'concurrent:devNoSync',
     ]);
 
     grunt.registerTask('release', [
diff --git a/awx/ui/grunt-tasks/concurrent.js b/awx/ui/grunt-tasks/concurrent.js
index f9606f0900..45085340bf 100644
--- a/awx/ui/grunt-tasks/concurrent.js
+++ b/awx/ui/grunt-tasks/concurrent.js
@@ -2,6 +2,10 @@ module.exports = {
     dev: {
         tasks: ['copy:vendor', 'copy:assets', 'copy:partials', 'copy:languages', 'copy:config', 'less:dev'],
     },
+    // This concurrent target is intended for development ui builds that do not require raising browser-sync or filesystem polling
+    devNoSync: {
+        tasks: ['copy:vendor', 'copy:assets', 'copy:partials', 'copy:languages', 'copy:config', 'less:dev', 'webpack:dev'],
+    },
     prod: {
     	tasks: ['newer:copy:vendor', 'newer:copy:assets', 'newer:copy:partials', 'newer:copy:languages', 'newer:copy:config', 'newer:less:prod']
     },
diff --git a/awx/ui/package.json b/awx/ui/package.json
index 9406e24173..0ad7504597 100644
--- a/awx/ui/package.json
+++ b/awx/ui/package.json
@@ -16,8 +16,9 @@
     "npm": "^3.10.3"
   },
   "scripts": {
-    "build-docker-machine": "ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt dev",
-    "build-docker-cid": "ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt dev",
+    "build-docker-machine": "grunt dev; ip=$(docker-machine ip $DOCKER_MACHINE_NAME); npm set ansible-tower:django_host ${ip}; grunt sync",
+    "build-docker-cid": "grunt dev; ip=`docker inspect --format '{{ .NetworkSettings.IPAddress }}' $DOCkER_CID` | npm set config ansible-tower:django_host ${ip}; grunt sync",
+    "build-devel": "grunt devNoSync",
     "pot": "grunt nggettext_extract",
     "languages": "grunt nggettext_compile",
     "build-release": "grunt release",

From bbf185cd0b00c6e05d48226abda5593b612a23a7 Mon Sep 17 00:00:00 2001
From: Shane McDonald 
Date: Thu, 27 Oct 2016 10:17:37 -0400
Subject: [PATCH 20/21] Add awx/public to clean target

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index a4b38e1cf6..8b79000e06 100644
--- a/Makefile
+++ b/Makefile
@@ -229,6 +229,7 @@ clean-venv:
 
 # Remove temporary build files, compiled Python files.
 clean: clean-rpm clean-deb clean-ui clean-tar clean-packer clean-bundle
+	rm -rf awx/public
 	rm -rf awx/lib/site-packages
 	rm -rf dist/*
 	rm -rf tmp

From 76fae6c05218e53226570460faa42881809e5c62 Mon Sep 17 00:00:00 2001
From: Alan Rominger 
Date: Thu, 27 Oct 2016 12:21:31 -0400
Subject: [PATCH 21/21] Revert "Introduce workflow failure condition"

---
 awx/api/serializers.py                        | 31 ++++++++-------
 ...rkflow_job_template_workflow_nodes_list.md | 14 -------
 awx/api/views.py                              | 14 -------
 .../0045_v310_workflow_failure_condition.py   | 24 ------------
 awx/main/models/workflow.py                   | 25 +-----------
 awx/main/scheduler/__init__.py                |  8 ++--
 .../tests/functional/models/test_workflow.py  | 39 -------------------
 .../tests/unit/models/test_workflow_unit.py   |  4 +-
 8 files changed, 21 insertions(+), 138 deletions(-)
 delete mode 100644 awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
 delete mode 100644 awx/main/migrations/0045_v310_workflow_failure_condition.py

diff --git a/awx/api/serializers.py b/awx/api/serializers.py
index d681fac426..d6aa39f706 100644
--- a/awx/api/serializers.py
+++ b/awx/api/serializers.py
@@ -2242,22 +2242,18 @@ class WorkflowJobListSerializer(WorkflowJobSerializer, UnifiedJobListSerializer)
     pass
 
 class WorkflowNodeBaseSerializer(BaseSerializer):
-    job_type = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
-    job_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
-    limit = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
-    skip_tags = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None)
+    job_type = serializers.SerializerMethodField()
+    job_tags = serializers.SerializerMethodField()
+    limit = serializers.SerializerMethodField()
+    skip_tags = serializers.SerializerMethodField()
     success_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
     failure_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
     always_nodes = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
-    fail_on_job_failure = serializers.BooleanField(
-        help_text=('If set to true, and if the job runs and fails, '
-                   'the workflow is marked as failed.'),
-        default=True)
 
     class Meta:
         fields = ('*', '-name', '-description', 'id', 'url', 'related',
                   'unified_job_template', 'success_nodes', 'failure_nodes', 'always_nodes',
-                  'inventory', 'credential', 'job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags', 'fail_on_job_failure')
+                  'inventory', 'credential', 'job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags')
 
     def get_related(self, obj):
         res = super(WorkflowNodeBaseSerializer, self).get_related(obj)
@@ -2265,12 +2261,17 @@ class WorkflowNodeBaseSerializer(BaseSerializer):
             res['unified_job_template'] = obj.unified_job_template.get_absolute_url()
         return res
 
-    def validate(self, attrs):
-        # char_prompts go through different validation, so remove them here
-        for fd in ['job_type', 'job_tags', 'skip_tags', 'limit']:
-            if fd in attrs:
-                attrs.pop(fd)
-        return super(WorkflowNodeBaseSerializer, self).validate(attrs)
+    def get_job_type(self, obj):
+        return obj.char_prompts.get('job_type', None)
+
+    def get_job_tags(self, obj):
+        return obj.char_prompts.get('job_tags', None)
+
+    def get_skip_tags(self, obj):
+        return obj.char_prompts.get('skip_tags', None)
+
+    def get_limit(self, obj):
+        return obj.char_prompts.get('limit', None)
 
 
 class WorkflowJobTemplateNodeSerializer(WorkflowNodeBaseSerializer):
diff --git a/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md b/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
deleted file mode 100644
index e6b078a23f..0000000000
--- a/awx/api/templates/api/workflow_job_template_workflow_nodes_list.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Workflow Job Template Workflow Node List
-
-Workflow nodes reference templates to execute and define the ordering
-in which to execute them. After a job in this workflow finishes,
-the subsequent actions are to:
-
- - run nodes contained in "failure_nodes" or "always_nodes" if job failed
- - run nodes contained in "success_nodes" or "always_nodes" if job succeeded
-
-The workflow is marked as failed if any jobs run as part of that workflow fail
-and have the field `fail_on_job_failure` set to true. If not, the workflow
-job is marked as successful.
-
-{% include "api/sub_list_create_api_view.md" %}
\ No newline at end of file
diff --git a/awx/api/views.py b/awx/api/views.py
index d22c030965..66980e141d 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -2404,7 +2404,6 @@ class JobTemplateLabelList(DeleteLastUnattachLabelMixin, SubListCreateAttachDeta
     serializer_class = LabelSerializer
     parent_model = JobTemplate
     relationship = 'labels'
-    new_in_300 = True
 
     def post(self, request, *args, **kwargs):
         # If a label already exists in the database, attach it instead of erroring out
@@ -2698,7 +2697,6 @@ class WorkflowJobTemplateList(ListCreateAPIView):
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateListSerializer
     always_allow_superuser = False
-    new_in_310 = True
 
     # TODO: RBAC
     '''
@@ -2716,12 +2714,10 @@ class WorkflowJobTemplateDetail(RetrieveUpdateDestroyAPIView):
     model = WorkflowJobTemplate
     serializer_class = WorkflowJobTemplateSerializer
     always_allow_superuser = False
-    new_in_310 = True
 
 
 class WorkflowJobTemplateLabelList(JobTemplateLabelList):
     parent_model = WorkflowJobTemplate
-    new_in_310 = True
 
 
 # TODO:
@@ -2729,7 +2725,6 @@ class WorkflowJobTemplateLaunch(GenericAPIView):
 
     model = WorkflowJobTemplate
     serializer_class = EmptySerializer
-    new_in_310 = True
 
     def get(self, request, *args, **kwargs):
         data = {}
@@ -2755,12 +2750,6 @@ class WorkflowJobTemplateWorkflowNodesList(SubListCreateAPIView):
     parent_model = WorkflowJobTemplate
     relationship = 'workflow_job_template_nodes'
     parent_key = 'workflow_job_template'
-    new_in_310 = True
-
-    def update_raw_data(self, data):
-        for fd in ['job_type', 'job_tags', 'skip_tags', 'limit', 'skip_tags']:
-            data[fd] = None
-        return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data)
 
 # TODO:
 class WorkflowJobTemplateJobsList(SubListAPIView):
@@ -2776,14 +2765,12 @@ class WorkflowJobList(ListCreateAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobListSerializer
-    new_in_310 = True
 
 # TODO:
 class WorkflowJobDetail(RetrieveDestroyAPIView):
 
     model = WorkflowJob
     serializer_class = WorkflowJobSerializer
-    new_in_310 = True
 
 class WorkflowJobWorkflowNodesList(SubListAPIView):
 
@@ -2793,7 +2780,6 @@ class WorkflowJobWorkflowNodesList(SubListAPIView):
     parent_model = WorkflowJob
     relationship = 'workflow_job_nodes'
     parent_key = 'workflow_job'
-    new_in_310 = True
 
 class SystemJobTemplateList(ListAPIView):
 
diff --git a/awx/main/migrations/0045_v310_workflow_failure_condition.py b/awx/main/migrations/0045_v310_workflow_failure_condition.py
deleted file mode 100644
index 9bafa0feb6..0000000000
--- a/awx/main/migrations/0045_v310_workflow_failure_condition.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0044_v310_project_playbook_files'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='workflowjobnode',
-            name='fail_on_job_failure',
-            field=models.BooleanField(default=True),
-        ),
-        migrations.AddField(
-            model_name='workflowjobtemplatenode',
-            name='fail_on_job_failure',
-            field=models.BooleanField(default=True),
-        ),
-    ]
diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py
index 3bc0608cfc..2848b38a4a 100644
--- a/awx/main/models/workflow.py
+++ b/awx/main/models/workflow.py
@@ -60,10 +60,6 @@ class WorkflowNodeBase(CreatedModifiedModel):
         default=None,
         on_delete=models.SET_NULL,
     )
-    fail_on_job_failure = models.BooleanField(
-        blank=True,
-        default=True,
-    )
     # Prompting-related fields
     inventory = models.ForeignKey(
         'Inventory',
@@ -97,22 +93,6 @@ class WorkflowNodeBase(CreatedModifiedModel):
                 data[fd] = self.char_prompts[fd]
         return data
 
-    @property
-    def job_type(self):
-        return self.char_prompts.get('job_type', None)
-
-    @property
-    def job_tags(self):
-        return self.char_prompts.get('job_tags', None)
-
-    @property
-    def skip_tags(self):
-        return self.char_prompts.get('skip_tags', None)
-
-    @property
-    def limit(self):
-        return self.char_prompts.get('limit', None)
-
     def get_prompts_warnings(self):
         ujt_obj = self.unified_job_template
         if ujt_obj is None:
@@ -157,7 +137,7 @@ class WorkflowNodeBase(CreatedModifiedModel):
         Return field names that should be copied from template node to job node.
         '''
         return ['workflow_job', 'unified_job_template',
-                'inventory', 'credential', 'char_prompts', 'fail_on_job_failure']
+                'inventory', 'credential', 'char_prompts']
 
 class WorkflowJobTemplateNode(WorkflowNodeBase):
     # TODO: Ensure the API forces workflow_job_template being set
@@ -403,9 +383,6 @@ class WorkflowJob(UnifiedJob, WorkflowJobOptions, JobNotificationMixin, Workflow
         from awx.main.tasks import RunWorkflowJob
         return RunWorkflowJob
 
-    def _has_failed(self):
-        return self.workflow_job_nodes.filter(job__status='failed', fail_on_job_failure=True).exists()
-
     def socketio_emit_data(self):
         return {}
 
diff --git a/awx/main/scheduler/__init__.py b/awx/main/scheduler/__init__.py
index 6ecdc09b37..b93ce6956e 100644
--- a/awx/main/scheduler/__init__.py
+++ b/awx/main/scheduler/__init__.py
@@ -73,12 +73,10 @@ def process_finished_workflow_jobs(workflow_jobs):
         dag = WorkflowDAG(workflow_job)
         if dag.is_workflow_done():
             with transaction.atomic():
-                if workflow_job._has_failed():
-                    workflow_job.status = 'failed'
-                else:
-                    workflow_job.status = 'successful'
+                # TODO: detect if wfj failed
+                workflow_job.status = 'completed'
                 workflow_job.save()
-                workflow_job.websocket_emit_status(workflow_job.status)
+                workflow_job.websocket_emit_status('completed')
 
 def rebuild_graph():
     """Regenerate the task graph by refreshing known tasks from Tower, purging
diff --git a/awx/main/tests/functional/models/test_workflow.py b/awx/main/tests/functional/models/test_workflow.py
index aa622d996a..cc61c34ed9 100644
--- a/awx/main/tests/functional/models/test_workflow.py
+++ b/awx/main/tests/functional/models/test_workflow.py
@@ -90,42 +90,3 @@ class TestWorkflowJobTemplate:
         assert len(parent_qs) == 1
         assert parent_qs[0] == wfjt.workflow_job_template_nodes.all()[1]
 
-@pytest.mark.django_db
-class TestWorkflowJobFailure:
-    @pytest.fixture
-    def wfj(self):
-        return WorkflowJob.objects.create(name='test-wf-job')
-
-    def test_workflow_has_failed(self, wfj):
-        """
-        Test that a single failed node with fail_on_job_failure = true
-        leads to the entire WF being marked as failed
-        """
-        job = Job.objects.create(name='test-job', status='failed')
-        # Node has a failed job connected
-        WorkflowJobNode.objects.create(workflow_job=wfj, job=job)
-        assert wfj._has_failed()
-
-    def test_workflow_not_failed_unran_job(self, wfj):
-        """
-        Test that an un-ran node will not mark workflow job as failed
-        """
-        WorkflowJobNode.objects.create(workflow_job=wfj)
-        assert not wfj._has_failed()
-
-    def test_workflow_not_failed_successful_job(self, wfj):
-        """
-        Test that a sucessful node will not mark workflow job as failed
-        """
-        job = Job.objects.create(name='test-job', status='successful')
-        WorkflowJobNode.objects.create(workflow_job=wfj, job=job)
-        assert not wfj._has_failed()
-
-    def test_workflow_not_failed_failed_job_but_okay(self, wfj):
-        """
-        Test that a failed node will not mark workflow job as failed
-        if the fail_on_job_failure is set to false
-        """
-        job = Job.objects.create(name='test-job', status='failed')
-        WorkflowJobNode.objects.create(workflow_job=wfj, job=job, fail_on_job_failure=False)
-        assert not wfj._has_failed()
diff --git a/awx/main/tests/unit/models/test_workflow_unit.py b/awx/main/tests/unit/models/test_workflow_unit.py
index bc7e9b5bce..9df61ffe97 100644
--- a/awx/main/tests/unit/models/test_workflow_unit.py
+++ b/awx/main/tests/unit/models/test_workflow_unit.py
@@ -139,7 +139,6 @@ class TestWorkflowJobCreate:
                 char_prompts=wfjt_node_no_prompts.char_prompts,
                 inventory=None, credential=None,
                 unified_job_template=wfjt_node_no_prompts.unified_job_template,
-                fail_on_job_failure=True,
                 workflow_job=workflow_job_unit)
 
     def test_create_with_prompts(self, wfjt_node_with_prompts, workflow_job_unit, mocker):
@@ -151,7 +150,6 @@ class TestWorkflowJobCreate:
                 inventory=wfjt_node_with_prompts.inventory,
                 credential=wfjt_node_with_prompts.credential,
                 unified_job_template=wfjt_node_with_prompts.unified_job_template,
-                fail_on_job_failure=True,
                 workflow_job=workflow_job_unit)
 
 @mock.patch('awx.main.models.workflow.WorkflowNodeBase.get_parent_nodes', lambda self: [])
@@ -217,7 +215,7 @@ class TestWorkflowWarnings:
 
     def test_warn_scan_errors_node_prompts(self, job_node_with_prompts):
         job_node_with_prompts.unified_job_template.job_type = 'scan'
-        job_node_with_prompts.char_prompts['job_type'] = 'run'
+        job_node_with_prompts.job_type = 'run'
         job_node_with_prompts.inventory = Inventory(name='different-inventory', pk=23)
         assert 'ignored' in job_node_with_prompts.get_prompts_warnings()
         assert 'job_type' in job_node_with_prompts.get_prompts_warnings()['ignored']

    
            
    NameTimeNameTime
            
    
            
    
     
     
    
    Loading...
    " +
+                                  loading + "
    ";
-                        html += (list.fieldActions.label === undefined || list.fieldActions.label) ? "Actions" : "";
+                        html += (list.fieldActions.label === undefined || list.fieldActions.label) ? i18n._("Actions") : "";
                         html += "