diff --git a/admin/app/translations.js b/admin/app/translations.js
index 2c12e3af..82da1cc3 100644
--- a/admin/app/translations.js
+++ b/admin/app/translations.js
@@ -228,6 +228,7 @@ function config($translateProvider) {
                 ON: 'On',
                 OFF: 'OFF',
                 OK: 'OK',
+                OPTIONAL: 'Optional',
                 ADD_SPACE: 'Add Space',
                 ADD_TENANT: 'Add Tenant',
                 ADD_STORE: 'Add Store',
@@ -387,7 +388,7 @@ function config($translateProvider) {
             CONTACT: {
                 EMAIL: 'Email',
                 PHONE: 'Phone',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_EMAIL: 'Please Input Email',
                 INPUT_PHONE: 'Please Input Phone',
                 INPUT_DESCRIPTION: 'Please Input Description',
@@ -453,7 +454,7 @@ function config($translateProvider) {
                 SELECT_DISTRIBUTION_SYSTEM: 'Select Distribution System',
                 SVG: 'SVG',
                 INPUT_SVG: 'Please Input SVG',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 DISTRIBUTION_CIRCUIT: 'Distribution Circuit',
                 N_S_DISTRIBUTION_CIRCUIT: ' Associated Distribution Circuit',
                 ADD_DISTRIBUTION_CIRCUIT: 'Add Distribution Circuit',
@@ -483,7 +484,7 @@ function config($translateProvider) {
                 SELECT_EQUIPMENT: 'Please Select Equipment',
                 COST_CENTER: 'Cost Center',
                 SELECT_COST_CENTER: 'Please Select Cost Center',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_DESCRIPTION: 'Please Input Description',
                 INPUT_METER: 'Please Input Meter',
                 OUTPUT_METER: 'Output Meter',
@@ -512,7 +513,7 @@ function config($translateProvider) {
                 SELECT_COMBINED_EQUIPMENT: 'Please Select Combined Equipment',
                 COST_CENTER: 'Cost Center',
                 SELECT_COST_CENTER: 'Please Select Cost Center',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_DESCRIPTION: 'Please Input Description',
                 BIND_EQUIPMENT: 'Bind Equipment',
                 N_S_EQUIPMENT: 'Bound Equipments',
@@ -549,7 +550,7 @@ function config($translateProvider) {
                 PARENT_SPACE: 'Parent Space',
                 AREA: 'Area',
                 INPUT_AREA: 'Please Input Area',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_DESCRIPTION: 'Please Input Description',
                 CURRENT_SELECTED_SPACE: 'Current Selected Space',
                 CHILD_SPACES: 'Child Spaces',
@@ -571,7 +572,7 @@ function config($translateProvider) {
                 LATITUDE: 'Latitude',
                 LONGITUDE: 'Longitude',
                 TYPE: 'Store Type',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_ADDRESS: 'Please Input Address',
                 INPUT_LATITUDE: 'Please Input Latitude',
                 INPUT_LONGITUDE: 'Please Input Longitude',
@@ -587,7 +588,7 @@ function config($translateProvider) {
                 LEASE_START_DATETIME: 'Lease Start Datetime',
                 LEASE_END_DATETIME: 'Lease End Datetime',
                 IS_IN_LEASE: 'Is In Lease',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_BUILDINGS: 'Please Input Buildings',
                 INPUT_FLOORS: 'Please Input Floors',
                 INPUT_ROOMS: 'Rooms',
@@ -600,7 +601,7 @@ function config($translateProvider) {
                 SELECT_SHOPFLOOR: 'Select Shopfloor',
                 AREA: 'Area',
                 INPUT_AREA: 'Please Input Area',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_DESCRIPTION: 'Please Input Description',
                 BIND_EQUIPMENT: 'Bind Equipment',
                 N_S_EQUIPMENT: 'Bound Equipments',
@@ -611,7 +612,7 @@ function config($translateProvider) {
                 INPUT_HOURLY_LOW_LIMIT: 'Please Input Hourly Low Limit',
                 HOURLY_HIGH_LIMIT: 'Hourly High Limit (Inclusive)',
                 INPUT_HOURLY_HIGH_LIMIT: 'Please Input Hourly High Limit',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_DESCRIPTION: 'Please Input Description',
                 MASTER_METER: 'Master Meter',
                 SELECT_MASTER_METER: 'Select Master Meter',
@@ -622,7 +623,7 @@ function config($translateProvider) {
                 ADD_SENSOR: 'Add Sensor',
                 EDIT_SENSOR: 'Edit Sensor',
                 DELETE_SENSOR: 'Delete Sensor',
-                DESCRIPTION: 'Description(Optional)',
+                DESCRIPTION: 'Description',
                 INPUT_DESCRIPTION: 'Please Input Description',
                 SELECT_SENSOR: 'Select Sensor',
             },
@@ -1275,6 +1276,7 @@ function config($translateProvider) {
                 ON: '打开',
                 OFF: '关闭',
                 OK: '确定',
+                OPTIONAL: '可选',
                 ADD_SPACE: '添加空间',
                 ADD_TENANT: '添加租户',
                 ADD_STORE: '添加门店',
@@ -1444,7 +1446,7 @@ function config($translateProvider) {
             CONTACT: {
                 EMAIL: '邮箱',
                 PHONE: '电话',
-                DESCRIPTION: '描述(可选)',
+                DESCRIPTION: '描述',
                 INPUT_EMAIL: '请输入邮箱',
                 INPUT_PHONE: '请输入电话',
                 INPUT_DESCRIPTION: '请输入描述',
@@ -2322,6 +2324,7 @@ function config($translateProvider) {
                 ON: 'anmachen',
                 OFF: 'Herunterfahren',
                 OK: 'bestimmen',
+                OPTIONAL: 'Optional',
                 ADD_SPACE: 'Platz hinzufügen',
                 ADD_TENANT: 'Mieter hinzufügen',
                 ADD_STORE: 'Laden hinzufügen',
@@ -2491,7 +2494,7 @@ function config($translateProvider) {
             CONTACT: {
                 EMAIL: 'Briefkasten',
                 PHONE: 'Telefon',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_EMAIL: 'Bitte geben Sie Ihre E-Mail-Adresse ein',
                 INPUT_PHONE: 'Bitte geben Sie das Telefon ein',
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
@@ -2520,7 +2523,7 @@ function config($translateProvider) {
                 RATIO: 'Skalierungsfaktor',
                 IS_TREND: 'Trend speichern',
                 ADDRESS: 'Adresse (JSON)',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_HIGH_LIMIT: 'Bitte geben Sie das obere Limit ein',
                 INPUT_LOW_LIMIT: 'Bitte geben Sie die Untergrenze ein',
                 INPUT_RATIO: 'Bitte geben Sie den Skalierungsfaktor ein',
@@ -2535,7 +2538,7 @@ function config($translateProvider) {
                 SELECT_DISTRIBUTION_SYSTEM: 'Bitte wählen Sie das Stromverteilungssystem',
                 SVG: 'SVG',
                 INPUT_SVG: 'Bitte geben Sie SVG ein',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 DISTRIBUTION_CIRCUIT: 'Verteilerkreis',
                 N_S_DISTRIBUTION_CIRCUIT: 'Eigener Verteilerkreis',
                 ADD_DISTRIBUTION_CIRCUIT: 'Verteilerkreis hinzufügen',
@@ -2587,7 +2590,7 @@ function config($translateProvider) {
                 SELECT_COMBINED_EQUIPMENT: 'Bitte wählen Sie ein Kombinationsgerät',
                 COST_CENTER: 'Kostenstelle',
                 SELECT_COST_CENTER: 'Bitte wählen Sie eine Kostenstelle',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 BIND_EQUIPMENT: 'Gerät binden',
                 N_S_EQUIPMENT: 'Gebundenes Gerät',
                 EQUIPMENT_LIST: 'Geräteliste',
@@ -2620,7 +2623,7 @@ function config($translateProvider) {
                 SELECT_EQUIPMENT: 'Bitte wählen Sie ein Gerät',
                 COST_CENTER: 'Kostenstelle',
                 SELECT_COST_CENTER: 'Bitte wählen Sie eine Kostenstelle',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_METER: 'Bitte geben Sie die Tabelle ein',
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
                 OUTPUT_METER: 'Ausgabetabelle',
@@ -2655,7 +2658,7 @@ function config($translateProvider) {
                 PARENT_SPACE: 'Überlegen',
                 AREA: 'Bereich',
                 INPUT_AREA: 'Bitte betreten Sie den Bereich',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
                 CURRENT_SELECTED_SPACE: 'Derzeit ausgewählter Platz',
                 CHILD_SPACES: 'Unterraum',
@@ -2688,7 +2691,7 @@ function config($translateProvider) {
                 LEASE_START_DATETIME: 'Datum und Uhrzeit des Mietbeginns',
                 LEASE_END_DATETIME: 'Datum und Uhrzeit des Leasingendes',
                 IS_IN_LEASE: 'Mieten Sie?',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibun',
                 INPUT_BUILDINGS: 'Bitte betreten Sie das Gebäude',
                 INPUT_FLOORS: 'Bitte betreten Sie den Boden',
                 INPUT_ROOMS: 'Bitte betreten Sie den Raum',
@@ -2700,7 +2703,7 @@ function config($translateProvider) {
                 LATITUDE: 'Breite',
                 LONGITUDE: 'Längengrad',
                 TYPE: 'Speichertyp',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_ADDRESS: 'Bitte geben Sie die Adresse ein',
                 INPUT_LATITUDE: 'Bitte geben Sie den Breitengrad ein',
                 INPUT_LONGITUDE: 'Bitte geben Sie den Längengrad ein',
@@ -2712,7 +2715,7 @@ function config($translateProvider) {
                 SELECT_SHOPFLOOR: 'Bitte Workshop auswählen',
                 AREA: 'Bereich',
                 INPUT_AREA: 'Bitte betreten Sie den Bereich',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
                 BIND_EQUIPMENT: 'Gerät binden',
                 N_S_EQUIPMENT: 'Gebundenes Gerät',
@@ -2723,7 +2726,7 @@ function config($translateProvider) {
                 INPUT_HOURLY_LOW_LIMIT: 'Bitte geben Sie das stündliche Minimum ein',
                 HOURLY_HIGH_LIMIT: 'Stundenmaximum (inklusive)',
                 INPUT_HOURLY_HIGH_LIMIT: 'Bitte geben Sie das Stundenmaximum ein',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
                 MASTER_METER: 'Überlegenes Messgerät',
                 SELECT_MASTER_METER: 'Wählen Sie das übergeordnete Messgerät aus',
@@ -2734,7 +2737,7 @@ function config($translateProvider) {
                 ADD_SENSOR: 'Sensor hinzufügen',
                 EDIT_SENSOR: 'Sensor bearbeiten',
                 DELETE_SENSOR: 'Sensor entfernen',
-                DESCRIPTION: 'Beschreibung (optional)',
+                DESCRIPTION: 'Beschreibung',
                 INPUT_DESCRIPTION: 'Bitte geben Sie eine Beschreibung ein',
                 SELECT_SENSOR: 'Sensor auswählen',
             },
diff --git a/admin/views/settings/combinedequipment/combinedequipment.html b/admin/views/settings/combinedequipment/combinedequipment.html
index 109dd89c..d96692fa 100644
--- a/admin/views/settings/combinedequipment/combinedequipment.html
+++ b/admin/views/settings/combinedequipment/combinedequipment.html
@@ -17,7 +17,7 @@
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'COMBINED_EQUIPMENT.COST_CENTER' | translate}}</th>
-										<th class="text-center">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/combinedequipment/combinedequipment.model.html b/admin/views/settings/combinedequipment/combinedequipment.model.html
index 0e987c87..420c5299 100644
--- a/admin/views/settings/combinedequipment/combinedequipment.model.html
+++ b/admin/views/settings/combinedequipment/combinedequipment.model.html
@@ -42,7 +42,7 @@
               </div>
           </div>
           <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-4 control-label">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}}</label>
+          <div class="form-group"><label class="col-sm-4 control-label">{{'COMBINED_EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-8"><input ng-model="combinedequipment.description" type="text" name="combinedequipmentdescription" class="form-control" >
                   <div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentdescription.$invalid && form_combinedequipment.combinedequipmentdescription.$dirty">
                       <small class="text-danger" ng-show="form_combinedequipment.combinedequipmentdescription.$error.required">{{'COMBINED_EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>
diff --git a/admin/views/settings/contact/contact.html b/admin/views/settings/contact/contact.html
index fe4d3ed9..b5568580 100644
--- a/admin/views/settings/contact/contact.html
+++ b/admin/views/settings/contact/contact.html
@@ -15,7 +15,7 @@
 												<th class="text-center">{{'SETTING.NAME' | translate}}</th>
 												<th class="text-center">{{'CONTACT.EMAIL' | translate}}</th>
 												<th class="text-center">{{'CONTACT.PHONE' | translate}}</th>
-												<th class="text-center">{{'CONTACT.DESCRIPTION' | translate}}</th>
+												<th class="text-center">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 												<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 											</tr>
 										</thead>
diff --git a/admin/views/settings/contact/contact.model.html b/admin/views/settings/contact/contact.model.html
index 5133c9ea..515bb78f 100644
--- a/admin/views/settings/contact/contact.model.html
+++ b/admin/views/settings/contact/contact.model.html
@@ -33,7 +33,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-3 control-label">{{'CONTACT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
 
                 <div class="col-sm-9"><input ng-model="contact.description" type="text" name="contactdescription" class="form-control" >
                     <div class="m-t-xs" ng-show="form_contact.description.$invalid && form_contact.description.$dirty">
diff --git a/admin/views/settings/datasource/datasource.html b/admin/views/settings/datasource/datasource.html
index 2476c26b..93c7bc22 100644
--- a/admin/views/settings/datasource/datasource.html
+++ b/admin/views/settings/datasource/datasource.html
@@ -71,7 +71,7 @@
 										<th class="text-center">{{'POINT.RATIO' | translate}}</th>
 										<th class="text-center">{{'POINT.IS_TREND' | translate}}</th>
 										<th class="text-center">{{'POINT.ADDRESS' | translate}}</th>
-										<th class="text-center">{{'POINT.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/datasource/point.model.html b/admin/views/settings/datasource/point.model.html
index 6d0eff16..00c1bc12 100644
--- a/admin/views/settings/datasource/point.model.html
+++ b/admin/views/settings/datasource/point.model.html
@@ -82,7 +82,7 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'POINT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-8">
                     <input ng-model="point.description" type="text" name="pointdescription" class="form-control">
                     <div class="m-t-xs" ng-show="form_point.pointdescription.$invalid && form_point.pointdescription.$dirty">
diff --git a/admin/views/settings/distributionsystem/distributionsystem.html b/admin/views/settings/distributionsystem/distributionsystem.html
index 2ed22e39..5ae1b772 100644
--- a/admin/views/settings/distributionsystem/distributionsystem.html
+++ b/admin/views/settings/distributionsystem/distributionsystem.html
@@ -13,7 +13,7 @@
 										<th class="text-center">{{'SETTING.ID' | translate}}</th>
 										<th class="text-center">{{'SETTING.NAME' | translate}}</th>
 										<th class="text-center">{{'DISTRIBUTION_SYSTEM.SVG' | translate}}</th>
-										<th class="text-center">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/distributionsystem/distributionsystem.model.html b/admin/views/settings/distributionsystem/distributionsystem.model.html
index 758843af..d85d0912 100644
--- a/admin/views/settings/distributionsystem/distributionsystem.model.html
+++ b/admin/views/settings/distributionsystem/distributionsystem.model.html
@@ -20,7 +20,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'DISTRIBUTION_SYSTEM.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-10"><input ng-model="distributionsystem.description" type="text" name="distributionsystemdescription" class="form-control" >
                 </div>
             </div>
diff --git a/admin/views/settings/equipment/equipment.html b/admin/views/settings/equipment/equipment.html
index 30dc6983..abba5542 100644
--- a/admin/views/settings/equipment/equipment.html
+++ b/admin/views/settings/equipment/equipment.html
@@ -15,7 +15,7 @@
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'EQUIPMENT.COST_CENTER' | translate}}</th>
-										<th class="text-center">{{'EQUIPMENT.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/equipment/equipment.model.html b/admin/views/settings/equipment/equipment.model.html
index 970d62bd..2f448f8b 100644
--- a/admin/views/settings/equipment/equipment.model.html
+++ b/admin/views/settings/equipment/equipment.model.html
@@ -42,7 +42,7 @@
               </div>
           </div>
           <div class="hr-line-dashed"></div>
-          <div class="form-group"><label class="col-sm-4 control-label">{{'EQUIPMENT.DESCRIPTION' | translate}}</label>
+          <div class="form-group"><label class="col-sm-4 control-label">{{'EQUIPMENT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-8"><input ng-model="equipment.description" type="text" name="equipmentdescription" class="form-control" >
                   <div class="m-t-xs" ng-show="form_equipment.equipmentdescription.$invalid && form_equipment.equipmentdescription.$dirty">
                       <small class="text-danger" ng-show="form_equipment.equipmentdescription.$error.required">{{'EQUIPMENT.INPUT_DESCRIPTION' | translate}}</small>
diff --git a/admin/views/settings/meter/meter.html b/admin/views/settings/meter/meter.html
index ac37e5cf..69f1616c 100644
--- a/admin/views/settings/meter/meter.html
+++ b/admin/views/settings/meter/meter.html
@@ -21,7 +21,7 @@
 										<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
 										<th class="text-center">{{'METER.MASTER_METER' | translate}}</th>
-										<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 
 									</tr>
@@ -179,7 +179,7 @@
 														</th>
 														<th class="text-center">{{'METER.MASTER_METER' | translate}}
 														</th>
-														<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
+														<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 													</tr>
 												</thead>
 												<tbody>
@@ -221,7 +221,7 @@
 										<th class="text-center">{{'SETTING.ENERGY_ITEM' | translate}}</th>
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
-										<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
@@ -264,7 +264,7 @@
 										<th class="text-center">{{'METER.HOURLY_LOW_LIMIT' | translate}}</th>
 										<th class="text-center">{{'METER.HOURLY_HIGH_LIMIT' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
-										<th class="text-center">{{'METER.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/meter/meter.model.html b/admin/views/settings/meter/meter.model.html
index 4a892d39..d9201240 100644
--- a/admin/views/settings/meter/meter.model.html
+++ b/admin/views/settings/meter/meter.model.html
@@ -93,7 +93,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-8">
                   <input ng-model="meter.description" type="text" name="meterdescription" class="form-control" >
                   <div class="m-t-xs" ng-show="form_meter.meterdescription.$invalid && form_meter.meterdescription.$dirty">
diff --git a/admin/views/settings/meter/offline-meter.model.html b/admin/views/settings/meter/offline-meter.model.html
index 67c254e3..e42172b9 100644
--- a/admin/views/settings/meter/offline-meter.model.html
+++ b/admin/views/settings/meter/offline-meter.model.html
@@ -81,7 +81,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-8">
                   <input ng-model="offlinemeter.description" type="text" name="offlinemeterdescription" class="form-control" >
                   <div class="m-t-xs" ng-show="form_offlinemeter.meterdescription.$invalid && form_offlinemeter.offlinemeterdescription.$dirty">
diff --git a/admin/views/settings/meter/virtual-meter.model.html b/admin/views/settings/meter/virtual-meter.model.html
index 048daa9b..81341aea 100644
--- a/admin/views/settings/meter/virtual-meter.model.html
+++ b/admin/views/settings/meter/virtual-meter.model.html
@@ -76,7 +76,7 @@
                         </div>
                     </div>
                     <div class="hr-line-dashed"></div>
-                    <div class="form-group"><label class="col-sm-5 control-label">{{'METER.DESCRIPTION' | translate}}</label>
+                    <div class="form-group"><label class="col-sm-5 control-label">{{'METER.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                       <div class="col-sm-7">
                           <input ng-model="virtualmeter.description" type="text" name="virtualmeterdescription" class="form-control" >
                           <div class="m-t-xs" ng-show="form_virtualmeter.meterdescription.$invalid && form_virtualmeter.virtualmeterdescription.$dirty">
diff --git a/admin/views/settings/sensor/sensor.html b/admin/views/settings/sensor/sensor.html
index 9818c887..94c64ec2 100644
--- a/admin/views/settings/sensor/sensor.html
+++ b/admin/views/settings/sensor/sensor.html
@@ -13,7 +13,7 @@
 										<tr>
 											<th class="text-center">{{'SETTING.ID' | translate}}</th>
 											<th class="text-center">{{'SETTING.NAME' | translate}}</th>
-											<th class="text-center">{{'SENSOR.DESCRIPTION' | translate}}</th>
+											<th class="text-center">{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 											<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 										</tr>
 									</thead>
diff --git a/admin/views/settings/sensor/sensor.model.html b/admin/views/settings/sensor/sensor.model.html
index 66385c6f..e7f7165d 100644
--- a/admin/views/settings/sensor/sensor.model.html
+++ b/admin/views/settings/sensor/sensor.model.html
@@ -13,7 +13,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'SENSOR.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'SENSOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-8">
                   <input ng-model="sensor.description" type="text" name="sensordescription" class="form-control" >
                   <div class="m-t-xs" ng-show="form_sensor.sensordescription.$invalid && form_sensor.sensordescription.$dirty">
diff --git a/admin/views/settings/shopfloor/shopfloor.html b/admin/views/settings/shopfloor/shopfloor.html
index 94c8e4fe..b1243cde 100644
--- a/admin/views/settings/shopfloor/shopfloor.html
+++ b/admin/views/settings/shopfloor/shopfloor.html
@@ -17,7 +17,7 @@
 										<th class="text-center">{{'SETTING.CONTACT' | translate}}</th>
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
-										<th class="text-center">{{'SHOPFLOOR.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'SHOPFLOOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/shopfloor/shopfloor.model.html b/admin/views/settings/shopfloor/shopfloor.model.html
index f0f0cc94..8951b162 100644
--- a/admin/views/settings/shopfloor/shopfloor.model.html
+++ b/admin/views/settings/shopfloor/shopfloor.model.html
@@ -54,7 +54,7 @@
                     </ui-select>
                 </div>
             </div>
-            <div class="form-group"><label class="col-sm-2 control-label">{{'SHOPFLOOR.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'SHOPFLOOR.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-10">
                   <input ng-model="shopfloor.description" type="text" name="shopfloordescription" class="form-control">
                   <div class="m-t-xs" ng-show="form_shopfloor.shopfloordescription.$invalid && form_shopfloor.shopfloordescription.$dirty">
diff --git a/admin/views/settings/space/space.html b/admin/views/settings/space/space.html
index e56ae709..ed380e84 100644
--- a/admin/views/settings/space/space.html
+++ b/admin/views/settings/space/space.html
@@ -40,7 +40,7 @@
 															{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
 														<th class="text-center">{{'SETTING.COSTCENTER' | translate}}
 														</th>
-														<th class="text-center">{{'SPACE.DESCRIPTION' | translate}}</th>
+														<th class="text-center">{{'SPACE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 														<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 													</tr>
 												</thead>
@@ -94,7 +94,7 @@
 															{{'SETTING.IS_OUTPUT_COUNTED' | translate}}</th>
 														<th class="text-center">{{'SETTING.COSTCENTER' | translate}}
 														</th>
-														<th class="text-center">{{'SPACE.DESCRIPTION' | translate}}</th>
+														<th class="text-center">{{'SPACE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 														<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 													</tr>
 												</thead>
diff --git a/admin/views/settings/space/space.model.html b/admin/views/settings/space/space.model.html
index 007eb02d..4911f571 100644
--- a/admin/views/settings/space/space.model.html
+++ b/admin/views/settings/space/space.model.html
@@ -101,7 +101,7 @@
                 </div>
             </div>
             <div class="hr-line-dashed"></div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'SPACE.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'SPACE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-8">
                     <input ng-model="space.description" type="text" name="spacedescription" class="form-control">
                     <div class="m-t-xs"
diff --git a/admin/views/settings/store/store.html b/admin/views/settings/store/store.html
index 515c53d8..94a6e651 100644
--- a/admin/views/settings/store/store.html
+++ b/admin/views/settings/store/store.html
@@ -20,7 +20,7 @@
 										<th class="text-center">{{'SETTING.CONTACT' | translate}}</th>
 										<th class="text-center">{{'SETTING.IS_INPUT_COUNTED' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
-										<th class="text-center">{{'STORE.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'STORE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/store/store.model.html b/admin/views/settings/store/store.model.html
index 791990b8..2c535c1b 100644
--- a/admin/views/settings/store/store.model.html
+++ b/admin/views/settings/store/store.model.html
@@ -90,7 +90,7 @@
                     </ui-select>
                 </div>
             </div>
-            <div class="form-group"><label class="col-sm-2 control-label">{{'STORE.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'STORE.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-10">
                   <input ng-model="store.description" type="text" name="storedescription" class="form-control">
                   <div class="m-t-xs" ng-show="form_store.storedescription.$invalid && form_store.storedescription.$dirty">
diff --git a/admin/views/settings/tenant/tenant.html b/admin/views/settings/tenant/tenant.html
index 2791c3bd..48c615ba 100644
--- a/admin/views/settings/tenant/tenant.html
+++ b/admin/views/settings/tenant/tenant.html
@@ -26,7 +26,7 @@
 										<th class="text-center">{{'TENANT.LEASE_END_DATETIME' | translate}}</th>
 										<th class="text-center">{{'TENANT.IS_IN_LEASE' | translate}}</th>
 										<th class="text-center">{{'SETTING.COSTCENTER' | translate}}</th>
-										<th class="text-center">{{'TENANT.DESCRIPTION' | translate}}</th>
+										<th class="text-center">{{'TENANT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</th>
 										<th class="text-center">{{'SETTING.ACTION' | translate}}</th>
 									</tr>
 								</thead>
diff --git a/admin/views/settings/tenant/tenant.model.html b/admin/views/settings/tenant/tenant.model.html
index 2fa837b9..486047bd 100644
--- a/admin/views/settings/tenant/tenant.model.html
+++ b/admin/views/settings/tenant/tenant.model.html
@@ -124,7 +124,7 @@
                     </ui-select>
                 </div>
             </div>
-            <div class="form-group"><label class="col-sm-2 control-label">{{'TENANT.DESCRIPTION' | translate}}</label>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'TENANT.DESCRIPTION' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
               <div class="col-sm-10">
                   <input ng-model="tenant.description" type="text" name="tenantdescription" class="form-control">
                   <div class="m-t-xs" ng-show="form_tenant.tenantdescription.$invalid && form_tenant.tenantdescription.$dirty">