Merge branch '3.8'

Conflicts:
	bower.json
	lib/classes/task/manager.php
	lib/conf.d/minifyGroupsConfig.php
	tests/classes/PhraseanetPHPUnitAbstract.php

www/scripts/apps/admin/fields/app.js

@@ -31,6 +31,9 @@ define([
             $leftBlock      : $(".left-block", this.$bottom),
             $rightBlock     : $(".right-block", this.$bottom),
             fieldsToDelete  : [],
+            lng             : function() {
+                return typeof p4 === "undefined" ? "en" : (p4.lng || "en");
+            },
             resizeListBlock: function () {
                 var listBlock = $(".list-block", AdminFieldApp.$leftBlock);
                 listBlock.height(AdminFieldApp.$window.height() - listBlock.offset().top - 10);

www/scripts/apps/admin/fields/views/edit.js

@@ -35,6 +35,7 @@ define([
         render: function() {
             var self = this;
             var template = _.template($("#edit_template").html(), {
+                lng: AdminFieldApp.lng(),
                 field: this.model.toJSON(),
                 vocabularyTypes: AdminFieldApp.vocabularyCollection.toJSON(),
                 modelErrors: AdminFieldApp.errorManager.getModelError(this.model),