diff --git a/openmrs/apps/adt/app.json b/openmrs/apps/adt/app.json
index 7fa36b947..f91896b74 100644
--- a/openmrs/apps/adt/app.json
+++ b/openmrs/apps/adt/app.json
@@ -34,53 +34,69 @@
                 "translationKey": "DASHBOARD_TAB_GENERAL_KEY",
                 "conceptName": "Adt Notes",
                 "sections": {
-                "vitals":{
-                    "translationKey":"DASHBOARD_TITLE_VITALS_KEY",
-                    "type": "vitals",
-                    "displayOrder": 0,
-                    "isObservation": true,
-                    "dashboardConfig": {
-                        "conceptNames": ["Vitals"],
-                        "numberOfVisits": 2
+                    "navigationLinksControl":{
+                        "translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY",
+                        "type": "navigationLinksControl",
+                        "displayOrder": 0,
+                        "showLinks" : ["home", "visit", "registration", "inpatient", "enrolment", "visitAttribute", "trends"]
+                    },
+                    "patientInformation":{
+                        "translationKey": "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY",
+                        "type": "patientInformation",
+                        "displayOrder": 1,
+                        "patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"],
+                        "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"]
+                    },
+                    "diagnosis":{
+                        "translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY",
+                        "type": "diagnosis",
+                        "numberOfVisits": 1,
+                        "showDetailsButton":true,
+                        "displayOrder": 2
+                    },
+                    "vitals":{
+                        "translationKey":"DASHBOARD_TITLE_VITALS_KEY",
+                        "type": "vitals",
+                        "displayOrder": 3,
+                        "isObservation": true,
+                        "dashboardConfig": {
+                            "conceptNames": ["Vitals"],
+                            "numberOfVisits": 2
+                        }
+                    },
+                    "HistoryAndExamination":{  
+                        "type":"historyAndExamination",
+                        "isObservation":true,
+                        "dashboardConfig":{  
+                            "showGroupDateTime":false,
+                            "conceptNames":[  
+                                "Chief Complaint Data",
+                                "Examination Notes",
+                                "Smoking History",
+                                "Clief COmplaint Notes",
+                                "Blood Pressure"
+                            ]
+                        },
+                        "displayOrder":4,
+                        "translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY"
+                    },
+                    "conditions": {
+                        "translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE",
+                        "type": "conditionsList",
+                        "displayOrder": 5
+                    },
+                    "admissionDetails":{
+                        "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
+                        "type":"admissionDetails",
+                        "displayOrder": 6
+                    },
+                    "disposition":{
+                        "translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
+                        "type": "disposition",
+                        "numberOfVisits": 1,
+                        "displayOrder": 7
                     }
-                },
-                "disposition":{
-                    "translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
-                    "type": "disposition",
-                    "numberOfVisits": 1,
-                    "displayOrder": 1
-                },
-                "diagnosis":{
-                    "translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY",
-                    "type": "diagnosis",
-                    "numberOfVisits": 1,
-                    "showDetailsButton":true,
-                    "displayOrder": 2
-                },
-                "patientInformation":{
-                    "translationKey": "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY",
-                    "type": "patientInformation",
-                    "displayOrder": 3,
-                    "patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"],
-                    "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"]
-                },
-                "admissionDetails":{
-                    "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
-                    "type":"admissionDetails",
-                    "displayOrder": 4
-                },
-                "navigationLinksControl":{
-                    "translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY",
-                    "type": "navigationLinksControl",
-                    "displayOrder": 5,
-                    "showLinks" : ["home", "visit", "registration", "inpatient", "enrolment", "visitAttribute"]
-                },
-                "conditions": {
-                    "translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE",
-                    "type": "conditionsList",
-                    "displayOrder": 6
                 }
-            }}
-
+            }
         }
 }
\ No newline at end of file
diff --git a/openmrs/apps/appointments/app.json b/openmrs/apps/appointments/app.json
index f49ac65b7..c82baaf6c 100644
--- a/openmrs/apps/appointments/app.json
+++ b/openmrs/apps/appointments/app.json
@@ -10,7 +10,8 @@
   "config": {
     "minCharLengthToTriggerPatientSearch": 3,
     "enableSpecialities": true,
-    "startOfWeek": "Monday",
+    "startOfWeek": 2,
+    "weekStart": "isoWeek",
     "calendarSlotDuration": "00:30",
     "calendarSlotLabelInterval": "01:00",
     "startOfDay":"09:00",
@@ -18,8 +19,8 @@
     "printListViewTemplateUrl": "/bahmni_config/openmrs/apps/appointments/printListView.html",
     "enableServiceTypes": false,
     "enableCalendarView": true,
+    "defaultViewCalendar": false,
     "isServiceOnAppointmentEditable": false,
-    "enableResetAppointmentStatuses": ["CheckedIn"],
     "colorsForAppointmentService": [
       "#006400",
       "#DC143C",
diff --git a/openmrs/apps/appointments/printListView.html b/openmrs/apps/appointments/printListView.html
index b9b27ef2a..653296422 100644
--- a/openmrs/apps/appointments/printListView.html
+++ b/openmrs/apps/appointments/printListView.html
@@ -1,4 +1,4 @@
-<title>Bahmni - Appointment Scheduling</title>
+<title>Appointment Scheduling</title>
 <style>
     h4, p, h5 {
         text-align: center;
@@ -38,13 +38,15 @@ <h5 ng-if="!searchedPatient">{{::'APPOINTMENT_DATE' | translate}} {{::startDate
                 <th>{{::'APPOINTMENT_PATIENT_ID' |translate}}</th>
                 <th class="table-mid-width">{{::'APPOINTMENT_PATIENT_NAME' |translate}}</th>
                 <th ng-if="searchedPatient" class="width-change">{{::'APPOINTMENT_DATE' |translate}}</th>
-                <th class="width-change">{{::'APPOINTMENT_START_TIME_KEY' |translate}}</th>
-                <th class="width-change">{{::'APPOINTMENT_END_TIME_KEY' |translate}}</th>
+                <!-- <th class="width-change">{{::'APPOINTMENT_START_TIME_KEY' |translate}}</th>
+                <th class="width-change">{{::'APPOINTMENT_END_TIME_KEY' |translate}}</th> -->
                 <th class="table-mid-width">{{::'APPOINTMENT_PROVIDER' |translate}}</th>
                 <th>{{::'APPOINTMENT_SERVICE' |translate}}</th>
-                <th class="table-mid-width" ng-if="enableServiceTypes">{{::'APPOINTMENT_SERVICE_TYPE_FULL' |translate}}</th>
-                <th class="table-mid-width">{{::'APPOINTMENT_SERVICE_LOCATION_KEY' |translate}}</th>
+                <!-- <th class="table-mid-width" ng-if="enableServiceTypes">{{::'APPOINTMENT_SERVICE_TYPE_FULL' |translate}}</th>
+                <th class="table-mid-width">{{::'APPOINTMENT_SERVICE_LOCATION_KEY' |translate}}</th> -->
                 <th>{{::'APPOINTMENT_STATUS' |translate}}</th>
+                <th>{{::'APPOINTMENT_CREATOR' |translate}}</th>
+                <th>{{::'APPOINTMENT_DATE_CREATED' |translate}}</th>
                 <!--<th class="notes">{{::'APPOINTMENT_COMMENTS' |translate}}</th>-->
             </tr>
             </thead>
@@ -53,13 +55,15 @@ <h5 ng-if="!searchedPatient">{{::'APPOINTMENT_DATE' | translate}} {{::startDate
                 <td>{{::appointment.patient.identifier}}</td>
                 <td class="table-mid-width">{{::appointment.patient.name | titleCase}}</td>
                 <td ng-if="searchedPatient">{{::appointment.startDateTime | bahmniDate}}</td>
-                <td>{{::appointment.startDateTime | bahmniTime}}</td>
-                <td>{{::appointment.endDateTime | bahmniTime}}</td>
+                <!-- <td>{{::appointment.startDateTime | bahmniTime}}</td>
+                <td>{{::appointment.endDateTime | bahmniTime}}</td> -->
                 <td class="table-mid-width">{{::appointment.provider.name}}</td>
                 <td>{{::appointment.service.name}}</td>
-                <td class="table-mid-width" ng-if="enableServiceTypes">{{::appointment.serviceType && (appointment.serviceType.name + ' [' + appointment.serviceType.duration + ' min]')}}</td>
-                <td class="table-mid-width">{{::appointment.location.name}}</td>
+                <!-- <td class="table-mid-width" ng-if="enableServiceTypes">{{::appointment.serviceType && (appointment.serviceType.name + ' [' + appointment.serviceType.duration + ' min]')}}</td>
+                <td class="table-mid-width">{{::appointment.location.name}}</td> -->
                 <td>{{::appointment.status}}</td>
+                <td>{{::appointment.creator.name}}</td>
+                <td>{{::appointment.createDate | bahmniDate}}</td>
                 <!--<td class="notes">{{::appointment.comments}}</td>-->
             </tr>
             </tbody>
diff --git a/openmrs/apps/clinical/app.json b/openmrs/apps/clinical/app.json
index 2f0150229..f8d542fb8 100644
--- a/openmrs/apps/clinical/app.json
+++ b/openmrs/apps/clinical/app.json
@@ -26,7 +26,7 @@
         "hideConditions": false,
         "enableRadiologyOrderOptions":["Urgent","NeedsPrint"],
         "enableLabOrderOptions":["Urgent", "NeedsPrint"],
-        "quickPrints":false,
+        "quickPrints":true,
         "networkConnectivity" : {
             "showNetworkStatusMessage": false,
             "networkStatusCheckInterval": 20000,
@@ -137,7 +137,72 @@
                 "Pain management given": true,
                 "Safe Abortion, Remarks": "Remarks",
                 "Malaria, Death Date": "2015-12-01"
+            },
+            "Safe abortion, Type of uterine evacuation procedure":{
+                "multiSelect": true
+            },
+            "Safe abortion, Contraceptive Method/s provided":{
+                "multiSelect": true
+            },
+            "Safe abortion, if other service provided specify":{
+                "multiSelect": true
+            },
+            "Pattern of food intake": {
+                "multiSelect": true
+            },
+            "Patient has confirmed": {
+                "multiSelect": true
+            },
+            "Method provided":{
+                "multiSelect": true
+            },
+            "Reason for Method Switch":{
+                "multiSelect": true
+            },
+            "Past Medical History":{
+                "multiSelect": true
+            },
+            "Feedback, Patient Name":{
+                "multiSelect": true
+            },
+            "ER, Non Trauma":{
+                "multiSelect": true
+            },
+            "ER, Oby/Gyn":{
+                "multiSelect": true
+            },
+            "Airway and breathing":{
+                "multiSelect": true
+            },
+            "Circulation":{
+                "multiSelect": true
+            },
+            "Dehydration (sever)(only in child with diarrhea) Plus any two of those":{
+                "multiSelect": true
+            },
+            "Ped T":{
+                "multiSelect": true
+            },
+            "Ped P":{
+                "multiSelect": true
+            },
+            "Ped R":{
+                "multiSelect": true
+            },
+            "Underlying disease":{
+                "multiSelect": true
+            },
+            "POS Co Morbidity":{
+                "multiSelect": true
+            },
+            "POS Risk factor":{
+                "multiSelect": true
+            },
+            "Operation Procedure":{
+                "multiSelect": true
             }
+
+
         },
         "visitPage": {
             "observationDisplay": {
diff --git a/openmrs/apps/clinical/dashboard.json b/openmrs/apps/clinical/dashboard.json
index 7febca3b0..d1101a832 100644
--- a/openmrs/apps/clinical/dashboard.json
+++ b/openmrs/apps/clinical/dashboard.json
@@ -3,6 +3,12 @@
         "translationKey":"DASHBOARD_TAB_GENERAL_KEY",
         "displayByDefault":true,
         "maxRecentlyViewedPatients":10,
+        "printing": {
+            "title": "TBGH Hospital",
+            "header": "General Summary Report",
+            "logo": "../images/bahmniLogo.jpg",
+            "showNameAndImage": true
+        },
         "sections":{  
             "patientInformation":{  
                 "translationKey":"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY",
@@ -19,18 +25,10 @@
                     "countyDistrict"
                 ]
             },
-            "diagnosis":{  
-                "translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY",
-                "type":"diagnosis",
-                "showCertainty":true,
-                "showOrder":true,
-                "showDetailsButton":true,
-                "displayOrder":1
-            },
             "navigationLinksControl":{  
                 "translationKey":"DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY",
                 "type":"navigationLinksControl",
-                "displayOrder":2,
+                "displayOrder":0,
                 "showLinks":[  
                     "home",
                     "visit",
@@ -40,79 +38,79 @@
                     "visitAttribute"
                 ]
             },
-	          "tuberculosis": {
-                "title": "Tuberculosis Follow Up",
-                "type": "tuberculosis",
-                "isObservation": true,
-                "dashboardConfig": {
-                    "conceptNames": [
-                        "Tuberculosis Followup Template"
-                    ],
-                    "numberOfVisits": 2
+            "visits":{  
+                "translationKey":"DASHBOARD_TITLE_VISITS_KEY",
+                "type":"visits",
+                "displayOrder":1,
+                "dashboardConfig":{  
+                    "title":null,
+                    "maximumNoOfVisits":8,
+                    "groupByVisits":true
                 }
             },
-            "disposition":{  
-                "translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
+            "diagnosis":{  
+                "translationKey":"DASHBOARD_TITLE_DIAGNOSIS_KEY",
+                "type":"diagnosis",
+                "showCertainty":true,
+                "showOrder":true,
                 "showDetailsButton":true,
-                "type":"disposition",
-                "numberOfVisits":1,
-                "displayOrder":7
+                "displayOrder":2
             },
-            "treatments":{  
-                "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY",
-                "type":"treatment",
-                "displayOrder":4,
+            "vitals":{  
+                "translationKey":"DASHBOARD_TITLE_VITALS_KEY",
+                "type":"vitals",
+                "isObservation":true,
+                "displayOrder":3,
                 "dashboardConfig":{  
-                    "showFlowSheet":true,
-                    "showListView":true,
-                    "showRoute":true,
-                    "showDrugForm":true,
-                    "numberOfVisits":5,
-                    "showOtherActive":true,
-                    "showDetailsButton":true
+                    "showDetailsButton":true,
+                    "conceptNames":[  
+                        "Vitals"
+                    ],
+                    "numberOfVisits":2
                 },
                 "expandedViewConfig":{  
-                    "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY",
-                    "showFlowSheet":true,
-                    "showListView":true,
-                    "showRoute":true,
-                    "showDrugForm":true,
-                    "numberOfVisits":10,
-                    "showOtherActive":true,
-                    "showDetailsButton":true
-                }
-            },
-            "radiology":{  
-                "translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY",
-                "type":"radiology",
-                "showDetailsButton":true,
-                "displayOrder":5
-            },
-            "programs":{  
-                "translationKey":"DASHBOARD_TITLE_PROGRAMS_KEY",
-                "type":"programs",
-                "displayOrder":10
-            },
-            "radiologyOrders":{  
-                "orderType":"Radiology Order",
-                "type":"ordersControl",
-                "translationKey":"DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY",
-                "displayOrder":17,
-                "dashboardConfig":{  
                     "conceptNames":[  
-                        "Summary"
+                        "Vitals"
                     ],
-                    "numberOfVisits":4
+                    "numberOfVisits":2,
+                    "showDetailsButton":true,
+                    "pivotTable":{  
+                        "numberOfVisits":"10",
+                        "groupBy":"encounters",
+                        "obsConcepts":[  
+                            "Weight",
+                            "Vitals"
+                        ],
+                        "drugConcepts":[  
+
+                        ],
+                        "labConcepts":[  
+
+                        ]
+                    }
                 }
             },
-            "pacs":{  
-                "orderType":"Radiology Order",
-                "type":"pacsOrders",
-                "translationKey":"DASHBOARD_TITLE_PACS_KEY",
-                "displayOrder":8,
+            "historyAndExaminations":{  
+                "translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY",
+                "type":"vitals",
+                "isObservation":true,
+                "displayOrder":4,
                 "dashboardConfig":{  
-                    "pacsImageUrl":"/oviyam2/viewer.html?patientID={{patientID}}&accessionNumber={{orderNumber}}",
-                    "numberOfVisits":4
+                    "showDetailsButton":true,
+                    "conceptNames":[  
+                        "History and Examination"
+                    ],
+                    "numberOfVisits":2
+                },
+                "expandedViewConfig":{  
+                    "conceptNames":[  
+                        "History and Examination"
+                    ],
+                    "numberOfVisits":2,
+                    "showDetailsButton":true,
+                    "pivotTable":{  
+
+                    }
                 }
             },
             "labOrdersDisplayControl":{  
@@ -120,7 +118,7 @@
                 "type":"ordersControl",
                 "orderType":"Lab Order",
                 "showDetailsButton":true,
-                "displayOrder":9,
+                "displayOrder":5,
                 "dashboardConfig":{  
                     "conceptNames":[  
                         "Systolic",
@@ -139,17 +137,6 @@
                     "showDetailsButton":true
                 }
             },
-            "bacteriologyResults":{  
-                "translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY",
-                "type":"bacteriologyResultsControl",
-                "scope":"All",
-                "orderType":"",
-                "dashboardConfig":{  
-                    "conceptNames":[  
-                        "BACTERIOLOGY CONCEPT SET"
-                    ]
-                }
-            },
             "labResults":{  
                 "translationKey":"DASHBOARD_TITLE_LAB_RESULTS_KEY",
                 "type":"labOrders",
@@ -168,11 +155,39 @@
                     "numberOfVisits":10
                 }
             },
+            "radiologyOrders":{  
+                "orderType":"Radiology Order",
+                "type":"ordersControl",
+                "translationKey":"DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY",
+                "displayOrder":7,
+                "dashboardConfig":{  
+                    "conceptNames":[  
+                        "Summary"
+                    ],
+                    "numberOfVisits":7
+                }
+            },
+	        "radiology":{  
+                "translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY",
+                "type":"radiology",
+                "showDetailsButton":true,
+                "displayOrder":8
+            },
+            "pacs":{
+                "orderType":"Radiology Order",
+                "type":"pacsOrders",
+                "translationKey":"DASHBOARD_TITLE_PACS_KEY",
+                "displayOrder":9,
+                "dashboardConfig":{
+                    "pacsImageUrl":"/oviyam2/viewer.html?patientID={{patientID}}&accessionNumber={{orderNumber}}",
+                    "numberOfVisits":4
+                }
+            },
             "nutritionalValues":{  
                 "translationKey":"DASHBOARD_TITLE_NUTRITIONAL_VALUES_KEY",
                 "type":"vitals",
                 "isObservation":true,
-                "displayOrder":11,
+                "displayOrder":10,
                 "dashboardConfig":{  
                     "conceptNames":[  
                         "HEIGHT",
@@ -198,142 +213,80 @@
                     }
                 }
             },
-            "vitals":{  
-                "translationKey":"DASHBOARD_TITLE_VITALS_KEY",
-                "type":"vitals",
-                "isObservation":true,
-                "displayOrder":12,
+            "treatments":{  
+                "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY",
+                "type":"treatment",
+                "displayOrder":11,
                 "dashboardConfig":{  
-                    "showDetailsButton":true,
-                    "conceptNames":[  
-                        "Vitals"
-                    ],
-                    "numberOfVisits":2
+                    "showFlowSheet":true,
+                    "showListView":true,
+                    "showRoute":true,
+                    "showDrugForm":true,
+                    "numberOfVisits":5,
+                    "showOtherActive":true,
+                    "showDetailsButton":true
                 },
                 "expandedViewConfig":{  
-                    "conceptNames":[  
-                        "Vitals"
-                    ],
-                    "numberOfVisits":2,
-                    "showDetailsButton":true,
-                    "pivotTable":{  
-                        "numberOfVisits":"10",
-                        "groupBy":"encounters",
-                        "obsConcepts":[  
-                            "Weight",
-                            "Vitals"
-                        ],
-                        "drugConcepts":[  
-
-                        ],
-                        "labConcepts":[  
-
-                        ]
-                    }
+                    "translationKey":"DASHBOARD_TITLE_TREATMENTS_KEY",
+                    "showFlowSheet":true,
+                    "showListView":true,
+                    "showRoute":true,
+                    "showDrugForm":true,
+                    "numberOfVisits":10,
+                    "showOtherActive":true,
+                    "showDetailsButton":true
                 }
             },
-            "secondVitals":{  
-                "translationKey":"DASHBOARD_TITLE_SECOND_VITALS_KEY",
-                "type":"second vitals",
-                "isObservation":true,
-                "displayOrder":13,
-                "dashboardConfig":{  
-                    "showDetailsButton":true,
-                    "conceptNames":[  
-                        "Second Vitals"
-                    ],
-                    "numberOfVisits":2
+            "formsDisplay": {
+                "type": "forms",
+                "displayOrder": 12,
+                "dashboardConfig": {
+                    "title": null,
+                    "maximumNoOfVisits": 10
                 },
-                "expandedViewConfig":{  
-                    "conceptNames":[  
-                        "Second Vitals"
-                    ],
-                    "numberOfVisits":2,
-                    "showDetailsButton":true,
-                    "pivotTable":{  
-
-                    }
-                }
+                "formGroup": [ ],
+                "translationKey": "DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY"
             },
-            "historyAndExaminations":{  
-                "translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY",
-                "type":"vitals",
-                "isObservation":true,
+            "programs":{  
+                "translationKey":"DASHBOARD_TITLE_PROGRAMS_KEY",
+                "type":"programs",
+                "displayOrder":13
+            },
+            "admissionDetails":{  
+                "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
+                "type":"admissionDetails",
                 "displayOrder":14,
-                "dashboardConfig":{  
-                    "showDetailsButton":true,
-                    "conceptNames":[  
-                        "History and Examination"
-                    ],
-                    "numberOfVisits":2
-                },
-                "expandedViewConfig":{  
-                    "conceptNames":[  
-                        "History and Examination"
-                    ],
-                    "numberOfVisits":2,
-                    "showDetailsButton":true,
-                    "pivotTable":{  
-
-                    }
-                }
+                "showDetailsButton":true
             },
-            "gynaecology":{  
-                "translationKey":"DASHBOARD_TITLE_GYNAECOLOGY_KEY",
-                "type":"gynaecology",
-                "isObservation":true,
-                "displayOrder":15,
-                "dashboardConfig":{  
-                    "conceptNames":[  
-                        "Gynaecology"
-                    ],
-                    "showDetailsButton":true,
-                    "numberOfVisits":2
-                },
-                "expandedViewConfig":{  
-                    "conceptNames":[  
-                        "Gynaecology"
-                    ],
-                    "numberOfVisits":2,
-                    "showDetailsButton":true,
-                    "pivotTable":{  
-
-                    }
+            "patientAppointments": {
+                "type": "custom",
+                "displayOrder": 15,
+                "config": {
+                    "title": "DASHBOARD_TITLE_APPOINTMENTS_KEY",
+                    "template": "<patient-appointments-dashboard section='config' patient='patient'></patient-appointments-dashboard>"
                 }
             },
-            "obstetrics":{  
-                "translationKey":"DASHBOARD_TITLE_OBSTETRICS_KEY",
-                "type":"obstetrics",
-                "isObservation":true,
-                "displayOrder":16,
+            "disposition":{  
+                "translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
+                "showDetailsButton":true,
+                "type":"disposition",
+                "numberOfVisits":1,
+                "displayOrder":16
+            },
+
+            "procedureOrders":{  
+                "orderType":"Procedure Order",
+                "type":"ordersControl",
+                "translationKey":"DASHBOARD_TITLE_PROCEDURE_ORDERS_KEY",
+                "displayOrder":17,
                 "dashboardConfig":{  
-                    "showDetailsButton":true,
                     "conceptNames":[  
-                        "Obstetrics"
-                    ],
-                    "numberOfVisits":2
-                },
-                "expandedViewConfig":{  
-                    "conceptNames":[  
-                        "Obstetrics"
+                        "Summary"
                     ],
-                    "numberOfVisits":2,
-                    "showDetailsButton":true,
-                    "pivotTable":{  
-
-                    }
-                }
-            },
-            "visits":{  
-                "translationKey":"DASHBOARD_TITLE_VISITS_KEY",
-                "type":"visits",
-                "displayOrder":3,
-                "dashboardConfig":{  
-                    "title":null,
-                    "maximumNoOfVisits":8,
-                    "groupByVisits":true
+                    "numberOfVisits":7
                 }
             },
+            
             "diabetes":{  
                 "title":"Diabetes",
                 "templateName":"Diabetes Templates",
@@ -373,33 +326,43 @@
                     }
                 }
             },
-            "admissionDetails":{  
-                "translationKey":"DASHBOARD_TITLE_ADMISSION_DETAILS_KEY",
-                "type":"admissionDetails",
-                "displayOrder":19,
-                "showDetailsButton":true
-            },
-            "conditions": {
-                "translationKey":"CONDITION_LIST_DISPLAY_CONTROL_TITLE",
-                "type": "conditionsList",
-                "displayOrder": 20
-            },
-            "formsDisplay": {
-                "type": "forms",
-                "displayOrder": 21,
-                "dashboardConfig": {
-                    "title": null,
-                    "maximumNoOfVisits": 10
+            "allObservationTemplate":{
+                "title":"All Observation",
+                "templateName":"All Observation Templates",
+                "type":"diseaseTemplate",
+                "displayOrder":18,
+                "dashboardConfig":{
+                    "showOnly":[
+
+                    ]
                 },
-                "formGroup": [ ],
-                "translationKey": "DASHBOARD_TITLE_FORMS_DISPLAY_CONTROL_KEY"
-            },
-            "patientAppointments": {
-                "type": "custom",
-                "displayOrder": 22,
-                "config": {
-                    "title": "DASHBOARD_TITLE_APPOINTMENTS_KEY",
-                    "template": "<patient-appointments-dashboard section='config' patient='patient'></patient-appointments-dashboard>"
+                "expandedViewConfig":{
+                    "showDetailsButton":true,
+                    "pivotTable":{
+                        "numberOfVisits":"15",
+                        "groupBy":"encounters",
+                        "obsConcepts":[
+                            "Weight",
+                            "Height",
+                            "Systolic",
+                            "Diastolic",
+                            "Diabetes, Foot Exam",
+                            "Diabetes, Eye Exam"
+                        ],
+                        "drugConcepts":[
+                            "Ipratropium Pressurised",
+                            "Garbhpal Rasa"
+                        ],
+                        "labConcepts":[
+                            "RBS",
+                            "FBS",
+                            "PP2BS",
+                            "Hb1AC",
+                            "Creatinine",
+                            "Albumin",
+                            "Polymorph"
+                        ]
+                    }
                 }
             }
         }
@@ -407,6 +370,12 @@
     "trends":{  
         "translationKey":"DASHBOARD_TAB_TRENDS_KEY",
         "maxRecentlyViewedPatients":10,
+        "printing": {
+            "title": "TBGH Hospital",
+            "header": "Trends Summary Report",
+            "logo": "../images/bahmniLogo.jpg",
+            "showNameAndImage": true
+        },
         "sections":{  
             "patientInformation":{  
                 "translationKey":"DASHBOARD_TITLE_PATIENT_INFORMATION_KEY",
@@ -456,6 +425,20 @@
                 },
                 "displayOrder":2
             },
+            "Vital":{  
+                "type":"observationGraph",
+                
+                "config":{  
+                    "yAxisConcepts":[  
+                        "SPO2 Data",
+                        "Temperature Data"
+                    ],
+                    "xAxisConcept":"observationDateTime",
+                    "numberOfVisits":10
+                },
+                "displayOrder":2,
+                "title": "Vital Sign"
+            },
             "weight/BMI":{  
                 "type":"observationGraph",
                 "translationKey": "DASHBOARD_TITLE_WEIGHT_BMI",
@@ -469,6 +452,30 @@
                 },
                 "displayOrder":3
             },
+            "AST": {
+                "type": "observationGraph",
+                "config": {
+                    "yAxisConcepts": [
+                        "Lab, AST"
+                    ],
+                    "xAxisConcept": "observationDateTime",
+                    "numberOfVisits": 10
+                },
+                "displayOrder": 8,
+                "title": "AST"
+            },
+            "Lab, Hemoglobin test result": {
+                "type": "observationGraph",
+                "config": {
+                    "yAxisConcepts": [
+                        "Haemoglobin"
+                    ],
+                    "xAxisConcept": "observationDateTime",
+                    "numberOfVisits": 10
+                },
+                "displayOrder": 6,
+                "title": "Hemoglobin"
+            },
             "diabetes/BloodSugar":{  
                 "type":"observationGraph",
                 "translationKey": "DASHBOARD_TITLE_DIABETES_BLOOD_SUGAR",
@@ -533,22 +540,46 @@
     "patientSummary":{  
         "translationKey":"DASHBOARD_TAB_PATIENT_SUMMARY_KEY",
         "maxRecentlyViewedPatients":10,
+        "printing": {
+            "title": "TBGH Hospital",
+            "header": "Patient Summary Report",
+            "logo": "../images/bahmniLogo.jpg",
+            "showNameAndImage": true
+        },
         "sections":{  
-            "Bacteriology Concept Set":{  
+            "vitals":{  
+                "translationKey":"DASHBOARD_TITLE_VITALS_KEY",
+                "type":"vitals",
+                "isObservation":true,
                 "displayType":"Full-Page",
-                "translationKey":"DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY",
-                "type":"obsToObsFlowSheet",
+                "displayOrder":1,
                 "dashboardConfig":{  
-                    "numberOfVisits":1,
-                    "templateName":"BACTERIOLOGY CONCEPT SET",
-                    "groupByConcept":"Specimen Collection Date",
+                    "showDetailsButton":false,
                     "conceptNames":[  
-                        "Specimen Id"
-                    ]
+                        "Vitals"
+                    ],
+                    "numberOfVisits":2
                 },
                 "expandedViewConfig":{  
-                    "templateName":"BACTERIOLOGY CONCEPT SET",
-                    "groupByConcept":"Specimen Collection Date"
+                    "conceptNames":[  
+                        "Vitals"
+                    ],
+                    "numberOfVisits":2,
+                    "showDetailsButton":true,
+                    "pivotTable":{  
+                        "numberOfVisits":"10",
+                        "groupBy":"encounters",
+                        "obsConcepts":[  
+                            "Weight",
+                            "Vitals"
+                        ],
+                        "drugConcepts":[  
+
+                        ],
+                        "labConcepts":[  
+
+                        ]
+                    }
                 }
             },
             "HistoryAndExamination":{  
@@ -565,7 +596,7 @@
                         "Blood Pressure"
                     ]
                 },
-                "displayOrder":6,
+                "displayOrder":2,
                 "translationKey":"DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY"
             },
             "drugOther":{  
@@ -573,43 +604,47 @@
                 "type":"drugOrderDetails",
                 "displayType":"Full-Page",
                 "showDetailsButton":true,
-                "displayOrder":24,
+                "displayOrder":5,
                 "dashboardConfig":{  
                     "showOnlyActive":true,
                     "drugConceptSet":"All Other Drugs"
                 }
             },
-            "malaria":{  
-                "title":"Malaria",
-                "type":"obsToObsFlowSheet",
-                "displayType":"Full-Page",
-                "displayOrder":26,
-                "dashboardConfig":{  
-                    "groupByConcept":"Malaria, Treatment Start Date",
-                    "templateName":"Malaria",
-                    "conceptNames":[  
-                        "Malaria, Parents Name",
-                        "Malaria, drug regimen",
-                        "Malaria, Malaria Type",
-                        "Malaria, Source"
-                    ]
-                }
-            },
-            "Chronic Treatment Chart":{  
+            "labResults":{  
+                "translationKey":"DASHBOARD_TITLE_LAB_RESULTS_KEY",
+                "type":"labOrders",
+                "displayOrder":3,
                 "displayType":"Full-Page",
-                "title":"Chronic Treatment Chart",
-                "type":"chronicTreatmentChart",
                 "dashboardConfig":{  
-                    "drugs":[  
-
-                    ]
+                    "title":null,
+                    "numberOfVisits":6,
+                    "showChart":false,
+                    "showTable":true,
+                    "showNormalLabResults": true,
+                    "showCommentsExpanded": true,
+                    "showAccessionNotes": true,
+                    "showDetailsButton":false
                 },
                 "expandedViewConfig":{  
-                    "drugs":[  
-
-                    ]
+                    "numberOfVisits":10
                 }
+            },
+            "radiology":{  
+                "translationKey":"DASHBOARD_TITLE_RADIOLOGY_KEY",
+                "type":"radiology",
+                "displayType":"Full-Page",
+                "showDetailsButton":true,
+                "displayOrder":4
+            },
+            "disposition":{  
+                "translationKey":"DASHBOARD_TITLE_DISPOSITION_KEY",
+                "showDetailsButton":true,
+                "type":"disposition",
+                "displayType":"Full-Page",
+                "numberOfVisits":1,
+                "displayOrder":6
             }
+            
         }
     }
 }
diff --git a/openmrs/apps/clinical/extension.json b/openmrs/apps/clinical/extension.json
index 8dd401c45..1c8fb5ce9 100644
--- a/openmrs/apps/clinical/extension.json
+++ b/openmrs/apps/clinical/extension.json
@@ -64,7 +64,7 @@
       "forwardUrl": "#/default/patient/{{patientUuid}}/dashboard"
     },
     "label": "Active",
-    "order": 1,
+    "order": 2,
     "requiredPrivilege": "app:clinical"
   },
   "bahmniClinicalPatientsSearchActivePatientsForPrograms": {
@@ -77,20 +77,20 @@
       "forwardUrl": "#/default/patient/{{patientUuid}}/consultationContext"
     },
     "label": "Active",
-    "order": 1,
-    "requiredPrivilege": "app:clinical"
+    "order": 3,
+    "requiredPrivilege": "app:clinical2"
   },
   "bahmniClinicalPatientsASearchActivePatientsByProvider": {
     "id": "bahmni.clinical.patients.search.activePatientsByProvider",
     "extensionPointId": "org.bahmni.patient.search",
     "type": "config",
     "extensionParams": {
-      "searchHandler": "emrapi.sqlSearch.activePatientsByProvider",
+      "searchHandler": "emrapi.sqlSearch.activePatientsByLocation",
       "translationKey": "MODULE_LABEL_MY_PATIENTS_KEY",
       "forwardUrl": "#/default/patient/{{patientUuid}}/dashboard"
     },
     "label": "Active",
-    "order": 2,
+    "order": 1,
     "requiredPrivilege": "app:clinical"
   },
   "bahmniClinicalPatientsSearchOPDActivePatientsByProvider": {
@@ -103,8 +103,8 @@
       "forwardUrl": "#/default/patient/{{patientUuid}}/consultationContext"
     },
     "label": "OPD-1",
-    "order": 3,
-    "requiredPrivilege": "app:clinical"
+    "order": 4,
+    "requiredPrivilege": "app:clinical2"
   },
   "activePatientsByLocation": {
     "id": "bahmni.clinical.patients.search.activePatientsByLocation",
@@ -116,8 +116,8 @@
       "forwardUrl": "#/default/patient/{{patientUuid}}/dashboard"
     },
     "label": "Active",
-    "order": 4,
-    "requiredPrivilege": "app:clinical"
+    "order": 5,
+    "requiredPrivilege": "app:clinical2"
   },
   "bahmniClinicalPatientsSearchAllPatients": {
     "id": "bahmni.clinical.patients.search.allPatients",
@@ -128,8 +128,8 @@
       "forwardUrl": "#/default/patient/{{patientUuid}}/dashboard"
     },
     "label": "All",
-    "order": 5,
-    "requiredPrivilege": "app:clinical"
+    "order": 6,
+    "requiredPrivilege": "app:clinical2"
   },
   "bahmniClinicalConceptSetGroupObservationsHistory": {
     "id": "bahmni.clinical.conceptSetGroup.observations.history",
@@ -223,16 +223,5 @@
     "icon": "icon-user-md",
     "order": 6,
     "requiredPrivilege": "app:clinical:ordersTab"
-  },
-  "bahmniClinicalConsultationBacteriology": {
-    "id": "bahmni.clinical.consultation.bacteriology",
-    "extensionPointId": "org.bahmni.clinical.consultation.board",
-    "type": "link",
-    "label": "Bacteriology",
-    "translationKey":"BACTERIOLOGY_BOARD_LABEL_KEY",
-    "url": "bacteriology",
-    "icon": "icon-user-md",
-    "order": 7,
-    "requiredPrivilege": "app:clinical:bacteriologyTab"
   }
 }
\ No newline at end of file
diff --git a/openmrs/apps/clinical/visit.json b/openmrs/apps/clinical/visit.json
index 2da1e54d7..85514421c 100644
--- a/openmrs/apps/clinical/visit.json
+++ b/openmrs/apps/clinical/visit.json
@@ -3,7 +3,7 @@
         "translationKey": "DASHBOARD_TAB_GENERAL_KEY",
         "displayByDefault": true,
         "printing": {
-            "title": "Bahmni",
+            "title": "TBGH Hospital",
             "header": "Visit",
             "logo": "../images/bahmniLogo.png"
         },
@@ -11,7 +11,7 @@
         "sections": {
             "pivotTable":{
                 "type": "pivotTable",
-                "displayOrder": 0,
+                "displayOrder": 10,
                 "title": "Vitals Flowsheet",
                 "config": {
                     "groupBy": "encounters",
@@ -45,10 +45,107 @@
             }
         }
     },
+    "trends":{
+        "translationKey":"DASHBOARD_TAB_TRENDS_KEY",
+        "printing": {
+            "title": "TBGH Hospital",
+            "header": "Trends",
+            "logo": "../images/bahmniLogo.png"
+        },
+        "sections": {
+            "PatientInformation":{
+                "type": "patientInformation",
+                "displayOrder": 0,
+                "config": {
+                    "title": "PatientInformation",
+                    "patientAttributes": ["caste", "class", "education", "occupation", "debt", "distanceFromCenter", "isUrban", "cluster","RationCard", "familyIncome"],
+                    "addressFields": ["address1", "address2", "cityVillage", "countyDistrict"]
+                }
+            },
+            "BP":{  
+                "type":"observationGraph",
+                "translationKey": "DASHBOARD_TITLE_BLOOD_PRESSURE",
+                "config":{  
+                    "yAxisConcepts":[  
+                        "Systolic Data",
+                        "Diastolic Data"
+                    ],
+                    "xAxisConcept":"observationDateTime",
+                    "numberOfVisits":10
+                },
+                "displayOrder":1
+            },
+            "Vital":{  
+                "type":"observationGraph",
+                
+                "config":{  
+                    "yAxisConcepts":[  
+                        "SPO2 Data",
+                        "Temperature Data"
+                    ],
+                    "xAxisConcept":"observationDateTime",
+                    "numberOfVisits":10
+                },
+                "displayOrder":2,
+                "title": "Vital Sign"
+            },
+            "weight/BMI":{  
+                "type":"observationGraph",
+                "translationKey": "DASHBOARD_TITLE_WEIGHT_BMI",
+                "config":{  
+                    "yAxisConcepts":[  
+                        "Weight",
+                        "BMI"
+                    ],
+                    "xAxisConcept":"observationDateTime",
+                    "numberOfVisits":10
+                },
+                "displayOrder":3
+            },
+           
+            "Lab, Hemoglobin test result": {
+                "type": "observationGraph",
+                "config": {
+                    "yAxisConcepts": [
+                        "Haemoglobin"
+                    ],
+                    "xAxisConcept": "observationDateTime",
+                    "numberOfVisits": 10
+                },
+                "displayOrder": 6,
+                "title": "Hemoglobin"
+            },
+            "diabetes/BloodSugar":{  
+                "type":"observationGraph",
+                "translationKey": "DASHBOARD_TITLE_DIABETES_BLOOD_SUGAR",
+                "config":{  
+                    "yAxisConcepts":[  
+                        "Blood Sugar Fasting",
+                        "Blood Sugar P.P"
+                    ],
+                    "xAxisConcept":"observationDateTime",
+                    "numberOfVisits":10
+                },
+                "displayOrder":4
+            },
+            "observationGraph":{  
+                "type":"observationGraph",
+                "translationKey": "DASHBOARD_TITLE_PULSE",
+                "config":{  
+                    "yAxisConcepts":[  
+                        "Pulse Data"
+                    ],
+                    "xAxisConcept":"observationDateTime",
+                    "numberOfVisits":10
+                },
+                "displayOrder":5
+            }
+        }
+    },
     "dischargeSummary":{
         "translationKey": "DASHBOARD_TAB_DISCHARGE_SUMMARY_KEY",
         "printing": {
-            "title": "Bahmni",
+            "title": "TBGH Hospital",
             "header": "Discharge Summary",
             "logo": "../images/bahmniLogo.png"
         },
diff --git a/openmrs/apps/customDisplayControl/js/customControl.js b/openmrs/apps/customDisplayControl/js/customControl.js
index 02b1f2496..2377a937e 100644
--- a/openmrs/apps/customDisplayControl/js/customControl.js
+++ b/openmrs/apps/customDisplayControl/js/customControl.js
@@ -149,7 +149,7 @@ angular.module('bahmni.common.displaycontrol.custom')
         },
         template: '<ng-include src="contentUrl"/>'
     }
-}]).directive('patientAppointmentsDashboard', ['$http', '$q', '$window','appService', function ($http, $q, $window, appService) {
+}]).directive('patientAppointmentsDashboard', ['$http', '$q', '$window','appService','$stateParams','$rootScope', function ($http, $q, $window, appService,$stateParams, $rootScope) {
     var link = function ($scope) {
         $scope.contentUrl = appService.configBaseUrl() + "/customDisplayControl/views/patientAppointmentsDashboard.html";
         var getUpcomingAppointments = function () {
@@ -184,7 +184,24 @@ angular.module('bahmni.common.displaycontrol.custom')
         });
 
         $scope.goToListView = function () {
-            $window.open('/bahmni/appointments/#/home/manage/appointments/list');
+           // $window.open('/bahmni/appointments/#/home/manage/appointments/list');
+           var options = $.extend({}, $stateParams);
+            $.extend(options, {
+                patient: $scope.patient,
+                visitUuid: $scope.patient.activeVisitUuid || null,
+                programUuid: $scope.patient.programUuid || null,
+                enrollment:  $scope.patient.enrollment || null,
+                forwardUrl:'/bahmni/appointments/#/home/manage/appointments/list/new' || null,
+                dateEnrolled: $scope.patient.dateEnrolled || null
+            });
+            var link ={
+                url: options.forwardUrl,
+                newTab: false
+            } 
+            if (link.url && link.url !== null) {
+                $rootScope.$broadcast("patientForAppointment", {patientForAppointment:$scope.patient});
+                $window.open(appService.getAppDescriptor().formatUrl(link.url+"//"+$scope.patient.uuid, options, false), link.newTab ? "_blank" : "_self");
+            }
         };
     };
     return {
diff --git a/openmrs/apps/forms/translations/testForm_1.json b/openmrs/apps/forms/translations/testForm_1.json
new file mode 100644
index 000000000..702d0f89e
--- /dev/null
+++ b/openmrs/apps/forms/translations/testForm_1.json
@@ -0,0 +1 @@
+{"en":{"concepts":{},"labels":{"LABEL_1":"Label"}}}
\ No newline at end of file
diff --git a/openmrs/apps/home/locale_languages.json b/openmrs/apps/home/locale_languages.json
index 78059ef2a..d709783df 100644
--- a/openmrs/apps/home/locale_languages.json
+++ b/openmrs/apps/home/locale_languages.json
@@ -2,5 +2,6 @@
   {"code": "es", "nativeName": "Español"},
   {"code": "fr", "nativeName": "Français"},
   {"code": "it", "nativeName": "Italiano"},
-  {"code": "pt_BR", "nativeName": "Português"}]
+  {"code": "pt_BR", "nativeName": "Português"},
+  {"code": "am", "nativeName": "Amharic"}]
 }
\ No newline at end of file
diff --git a/openmrs/apps/home/whiteLabel.json b/openmrs/apps/home/whiteLabel.json
index 10305921f..d51509454 100644
--- a/openmrs/apps/home/whiteLabel.json
+++ b/openmrs/apps/home/whiteLabel.json
@@ -1,6 +1,6 @@
 {
   "homePage": {
-    "header_text": "<b>WELCOME TO<br />BAHMNI EMR & HOSPITAL SERVICE",
+    "header_text": "<b>WELCOME TO<br />TIRUNESH BEJING GENERAL HOSPITAL EMR & HOSPITAL SERVICE",
     "logo": "/bahmni/images/bahmniLogoFull.png",
     "title_text": " "
   },
diff --git a/openmrs/apps/ipd/app.json b/openmrs/apps/ipd/app.json
index 4a0205be0..1b3d38b34 100644
--- a/openmrs/apps/ipd/app.json
+++ b/openmrs/apps/ipd/app.json
@@ -21,7 +21,7 @@
         "onTransferForwardTo": "#",
         "onDischargeForwardTo": "#",
         "defaultVisitType": "IPD",
-        "expectedDateOfDischarge": "",
+        "expectedDateOfDischarge": "IPD Intended Discharge",
         "conceptSetUI": {
             "Expected Date of Discharge": {
                 "disableAddNotes": true,
diff --git a/openmrs/apps/orders/extension.json b/openmrs/apps/orders/extension.json
index 9c2dddee7..40dccf7c8 100644
--- a/openmrs/apps/orders/extension.json
+++ b/openmrs/apps/orders/extension.json
@@ -1,18 +1,18 @@
 {
 	"bahmniClinicalPatientsSearchRadiologyOrderAllPatients":{
-	 "id": "bahmni.clinical.patients.search.RadiologyOrderAllPatients",
-	 "extensionPointId": "org.bahmni.patient.search",
-	 "type": "config",
-	 "extensionParams": {
-	  "searchHandler": "emrapi.sqlSearch.activePatients",
-	  "display":"Radiology Orders",
-	   "translationKey": "MODULE_LABEL_RADIOLOGY_ORDERS_KEY",
-	  "forwardUrl" : "../orders/#/patient/{{patientUuid}}/fulfillment/Radiology Order",
-	  "forwardButtonTitle" : "View",
-	  "view":"tabular"
-	 },
-	 "label": "Radiology Order",
-	 "order": 1,
-	 "requiredPrivilege": "app:orders"
-	 }
+		"id": "bahmni.clinical.patients.search.RadiologyOrderAllPatients",
+		"extensionPointId": "org.bahmni.patient.search",
+		"type": "config",
+		"extensionParams": {
+			"searchHandler": "emrapi.sqlSearch.activePatients",
+			"display":"Orders",
+			"translationKey": "MODULE_LABEL_RADIOLOGY_ORDERS_KEY",
+			"forwardUrl" : "../orders/#/patient/{{patientUuid}}/fulfillment/Radiology Order",
+			"forwardButtonTitle" : "View",
+			"view":"tabular"
+		},
+		"label": "Orders",
+		"order": 1,
+		"requiredPrivilege": "app:orders"
+	}
 }
\ No newline at end of file
diff --git a/openmrs/apps/registration/app.json b/openmrs/apps/registration/app.json
index cbf79be58..514ca8b66 100644
--- a/openmrs/apps/registration/app.json
+++ b/openmrs/apps/registration/app.json
@@ -29,18 +29,27 @@
                 "additionalPatientInformation": {
                     "title": "Additional Patient Information",
                     "attributes": [
-                        "distanceFromCenter",
-                        "isUrban",
-                        "cluster",
-                        "RationCard",
-                        "familyIncome",
-                        "debt",
-                        "cluster"
+                        "Name",
+                        "Phone",
+                        "Address"
                     ]
                 },
                 "hidden": {
                     "attributes": [
-                        "primaryContact"
+                        "cluster",
+                        "landHolding",
+                        "secondaryContact",
+                        "distanceFromCenter",
+                        "class",
+                        "cluster",
+                        "familyIncome",
+                        "RationCard",
+                        "debt",
+                        "isUrban",
+                        "occupation",
+                        "secondaryIdentifier",
+                        "education",
+                        "caste"
                     ]
                 },
                 "defaults":  {
@@ -49,8 +58,8 @@
                 }
             },
             "addressHierarchy": {
-                "showAddressFieldsTopDown": false,
-                "strictAutocompleteFromLevel": "stateProvince"
+                "showAddressFieldsTopDown": true,
+                "strictAutocompleteFromLevel": ""
             },
             "relationshipTypeMap": {
                 "Doctor":"provider",
@@ -58,7 +67,6 @@
             },
 
             "autoCompleteFields":["familyName", "caste"],
-            "defaultIdentifierPrefix": "GAN",
             "defaultVisitType": "OPD",
             "searchByIdForwardUrl": "/patient/{{patientUuid}}",
             "showMiddleName": true,
@@ -71,23 +79,13 @@
             "printOptions": [
                 {
                     "translationKey": "REGISTRATION_PRINT_REG_CARD_LOCAL_KEY",
-                    "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print_local.html",
-                    "shortcutKey": "l"
-                },
-                {
-                    "translationKey": "REGISTRATION_PRINT_REG_CARD_KEY",
-                    "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print.html",
-                    "shortcutKey": "p"
-                },
-                {
-                    "translationKey": "REGISTRATION_PRINT_SUPPLEMENTAL_PAPER",
-                    "templateUrl": "/bahmni_config/openmrs/apps/registration/supplementalPaperLayout/print.html",
-                    "shortcutKey": "r"
+                    "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print_main.html",
+                    "shortcutKey": "c"
                 },
                 {
-                    "translationKey": "REGISTRATION_PRINT_WITH_BARCODE",
-                    "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/printWithBarcode.html",
-                    "shortcutKey": "c"
+                "translationKey": "REGISTRATION_PRINT_REG_CARD_KEY",
+                "templateUrl": "/bahmni_config/openmrs/apps/registration/registrationCardLayout/print_index.html",
+                "shortcutKey": "z"
                 }
             ],
             "conceptSetUI": {
@@ -112,15 +110,15 @@
             },
             "patientSearch": {
                 "address": {
-                    "label": "Rural Ward",
-                    "placeholder": "Enter ward",
-                    "field": "address2"
+                  "label": "Woreda/Subcity",
+                  "placeholder": "ወረዳ/ክፍለ ከተማ ",
+                  "field": "City_Village"
                 },
                 "customAttributes": {
-                    "label": "रुग्णाचे नाव",
-                    "placeholder": "रुग्णाचे नाव",
-                    "fields": ["givenNameLocal", "middleNameLocal", "familyNameLocal"]
+                  "label": "Phone Number",
+                  "placeholder": "ስልክ ቁጥር",
+                  "fields": ["PhoneNumber"]
                 }
-            }
+              }
         }
 }
diff --git a/openmrs/apps/registration/extension.json b/openmrs/apps/registration/extension.json
index f42906ff8..02bc385c5 100644
--- a/openmrs/apps/registration/extension.json
+++ b/openmrs/apps/registration/extension.json
@@ -45,18 +45,6 @@
         "order": 1,
         "requiredPrivilege": "Edit Visits"
     },
-    "feeInformation":{
-        "id": "bahmni.registration.conceptSetGroup.feeInformation",
-        "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations",
-        "type": "config",
-        "extensionParams": {
-            "conceptName": "Fee Information",
-            "translationKey": "FEE_INFORMATION_LOCALE_KEY",
-            "required":true
-        },
-        "order": 2,
-        "requiredPrivilege": "Edit Visits"
-    },
     "nutritionalValue":{
         "id": "bahmni.registration.conceptSetGroup.nutritionalValue",
         "extensionPointId": "org.bahmni.registration.conceptSetGroup.observations",
@@ -70,4 +58,4 @@
         "order": 3,
         "requiredPrivilege": "Edit Visits"
     }
-}
+}
\ No newline at end of file
diff --git a/openmrs/apps/registration/registrationCardLayout/css/image/st.paul-full.png b/openmrs/apps/registration/registrationCardLayout/css/image/st.paul-full.png
new file mode 100644
index 000000000..3e90b2951
Binary files /dev/null and b/openmrs/apps/registration/registrationCardLayout/css/image/st.paul-full.png differ
diff --git a/openmrs/apps/registration/registrationCardLayout/css/indexStyle.css b/openmrs/apps/registration/registrationCardLayout/css/indexStyle.css
new file mode 100644
index 000000000..591ba3901
--- /dev/null
+++ b/openmrs/apps/registration/registrationCardLayout/css/indexStyle.css
@@ -0,0 +1,127 @@
+#indexc-container {
+  font-family: "Times New Roman";
+  display: block;
+  width: 92mm;
+  height: 64mm;
+  border: 0.5mm solid #000;
+  text-align: center;
+  padding-top: 3mm;
+  padding-right: 3mm;
+  padding-left: 3mm;
+  text-transform: uppercase;
+  overflow: hidden;
+  /*page:xsmall;*/
+  page-break-before: always;
+  background-image: url("image/st.paul-full.png");
+  background-size: 20mm auto;
+  background-repeat: no-repeat;
+  background-position: top right;
+  background-origin: content-box;
+  background-clip: content-box;
+}
+
+.mc-title {
+  font-size: 18pt;
+  margin-bottom: 10mm;
+}
+
+.title {
+  font-size: 11pt;
+  margin-bottom: 2mm;
+}
+
+.content {
+  font-size: 8pt;
+}
+
+.content div {
+  width: 100%;
+  text-align: left;
+  clear: both;
+  padding-top: 1mm;
+}
+
+.left {
+  float: left;
+}
+
+.right {
+  float: right;
+}
+
+.right-unfloat {
+  float: left;
+}
+
+.high-margin {
+  margin-left: 20mm;
+}
+
+.low-margin {
+  margin-left: 10mm;
+}
+
+.value {
+  /*float:left;*/
+  border-bottom: 1pt solid #000;
+  min-width: 30pt;
+  font-weight: bold;
+}
+
+.am-value {
+  /*float:left;*/
+  border-bottom: 1pt solid #000;
+  min-width: 30pt;
+}
+
+#main-chart-container table td {
+  font-size: 14pt;
+  text-transform: uppercase;
+  padding-top: 0mm;
+  padding-bottom: 10mm;
+  padding-left: 0mm;
+  text-align: left;
+  white-space: nowrap;
+}
+
+table {
+  margin: 0mm;
+  padding: 0mm;
+  autosize: 2;
+}
+
+table td {
+  font-size: 9pt;
+  text-transform: uppercase;
+  padding-bottom: 0mm;
+  padding-top: 0.5mm;
+  padding-left: 0mm;
+  text-align: left;
+  white-space: nowrap;
+}
+
+.first {
+  padding-right: 10mm;
+}
+
+.am-font {
+  font-family: nyala;
+  font-size: 10pt;
+}
+
+#main-chart-container .am-font {
+  font-family: nyala;
+  font-size: 18pt;
+}
+
+#main-chart-container table td.mc-mrn-special {
+  font-size: 48pt;
+  text-align: center;
+  font-weight: bold;
+  padding-bottom: 2mm;
+}
+
+@page {
+  /*sheet-size:420mm 277mm;/*A3 paper size*/
+  size: A7 landscape;
+}
\ No newline at end of file
diff --git a/openmrs/apps/registration/registrationCardLayout/css/print_identification_card.css b/openmrs/apps/registration/registrationCardLayout/css/print_identification_card.css
new file mode 100644
index 000000000..f23562990
--- /dev/null
+++ b/openmrs/apps/registration/registrationCardLayout/css/print_identification_card.css
@@ -0,0 +1,7 @@
+.sheet {
+    margin: 0;
+    overflow: hidden;
+    position: relative;
+    box-sizing: border-box;
+    page-break-after: always;
+}
diff --git a/openmrs/apps/registration/registrationCardLayout/print_index.html b/openmrs/apps/registration/registrationCardLayout/print_index.html
new file mode 100644
index 000000000..9d20ce7a9
--- /dev/null
+++ b/openmrs/apps/registration/registrationCardLayout/print_index.html
@@ -0,0 +1,76 @@
+<link rel="stylesheet" href="/bahmni_config/openmrs/apps/registration/registrationCardLayout/css/indexStyle.css"/>
+<div class="A7 landscape">
+    <div class="sheet">
+        <div id="indexc-container">  
+                <div class="title">
+                        <!-- <img style="position:absolute;left:5mm;" id="barcode"
+                        jsbarcode-value="{{patient.primaryIdentifier.identifier}}"
+                        jsbarcode-width="1.2"
+                        jsbarcode-height="30"
+                        jsbarcode-margin="0"
+                        jsbarcode-displayValue="false"
+                        jsbarcode-textAlign="left"
+                        jsbarcode-textMargin="0"
+                        jsbarcode-fontSize="10"
+            
+                    /> -->
+                    <span style="font-family:nyala">ካርድ ማውጫ</span> <br/>
+                    INDEX CARD
+                </div>
+            
+                <!-- <table>
+                    <tr>
+                        <td>
+                            <span class="am-font">የተመዘገበበት ቀን</span><br/>
+                            Date of registration  <span class="am-value am-font">{{patient.registrationDate | bahmniDate}}</span>
+                        </td>
+                        <td></td>
+                    </tr>
+                </table> -->
+                <table>
+                    <tr>
+                        <td class="first">               
+                            <span class="am-font">ስም</span><br/>
+                            Name  <span class="value">{{patient.givenName}} {{patient.middleName}} {{patient.familyName}}</span>               
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td  class="first">
+                            <span class="am-font">ፆታ</span><br/>
+                            Sex  <span class="value"> {{patient.gender}} </span>
+                        </td>
+                        <td>
+                            <span class="am-font">እድሜ</span><br/>
+                            Age  <span class="value"> {{patient.age.years}} </span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td class="first" style="padding-top:5px;">
+                            <span class="am-font">የህክምና ካርድ ቁጥር</span><br/>
+                            Medical record number  <span class="value" style="font-size:18pt">{{patient.primaryIdentifier.identifier}}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td style="padding-top:5px; text-align: center">
+                            <img id="barcode" jsbarcode-value="{{patient.primaryIdentifier.identifier}}"
+                                jsbarcode-width="2" jsbarcode-height="65" jsbarcode-margin="0"
+                                jsbarcode-displayValue="false" jsbarcode-textAlign="left" jsbarcode-textMargin="0"
+                                jsbarcode-fontSize="10" />
+                        </td>
+                    </tr>
+                </table>        
+            </div>
+    </div>
+</div>
+
+
+<script type="text/javascript" src="/bahmni_config/openmrs/apps/JsBarcode.all.min.js"></script>
+<script>
+    (function() {
+        JsBarcode("#barcode").init();
+    })();
+</script>
\ No newline at end of file
diff --git a/openmrs/apps/registration/registrationCardLayout/print_main.html b/openmrs/apps/registration/registrationCardLayout/print_main.html
new file mode 100644
index 000000000..0e7f4a3b6
--- /dev/null
+++ b/openmrs/apps/registration/registrationCardLayout/print_main.html
@@ -0,0 +1,129 @@
+<link rel="stylesheet" href="/bahmni_config/openmrs/apps/registration/registrationCardLayout/css/print.css" />
+<div id="main-chart-container">
+    <table>
+        <tr>
+            <td style="width:213mm;"></td>
+            <td style="width:193mm;">
+                <div class="mc-title">
+                    <span style="font-family:nyala;font-size:24pt;">የህክምና ካርድ</span> <br />
+                    PATIENT CHART
+                </div>
+
+                <table>
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">የህክምና ካርድ ቁጥር</span><br />
+                            Medical record number <span class="value"
+                                style="font-size:12pt">{{patient.primaryIdentifier.identifier}}</span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td>
+                            <span class="am-font">የተመዘገበበት ቀን</span><br />
+                            Date of registration <span
+                                class="am-value am-font">{{patient.registrationDate | bahmniDate}}</span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">ስም</span><br />
+                            Name <span class="value">{{patient.givenName}}</span>
+                        </td>
+                        <td>
+                            <span class="am-font">የአባት ስም</span><br />
+                            Father\'s name <span class="value">{{patient.middleName}}</span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">የአያት ስም</span><br />
+                            Grand father\'s Name <span class="value">{{patient.familyName}}</span>
+                        </td>
+                        <td>
+                            <span class="am-font">ፆታ</span><br />
+                            Sex <span class="value"> {{patient.gender}} </span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">የልደት ቀን</span><br />
+                            Date of Birth <span class="am-value am-font"> {{patient.birthdate | bahmniDate}} </span>
+                        </td>
+                        <td>
+                            <span class="am-font">እድሜ</span><br />
+                            Age <span class="value"> {{patient.age.years}} </span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">አድራሻ</span><br />
+                            Address <span class="value"> </span>
+                        </td>
+                        <td>
+                            <span class="am-font">ክልል</span><br />
+                            Region <span class="value">{{patient.address.stateProvince}}</span>
+                        </td>
+                    </tr>
+                </table>
+                <table>
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">ክፍለ ከተማ</span><br />
+                            Woreda/subcity <span class="value">{{patient.address.longitude}}</span>
+                        </td>
+                    </tr>
+                </table>
+                <table style="width:100%">
+                    <tr>
+                        <td class="first">
+                            <span class="am-font">ወረዳ</span><br />
+                            kebele <span class="value">{{patient.address.cityVillage}}</span>
+                        </td>
+                        <td>
+                            <span class="am-font">የቤት ቁጥር</span><br />
+                            House Number <span class="value">{{patient.address.address2}}</span>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>
+                            <span class="am-font">ስልክ ቁጥር</span><br />
+                            Phone Number <span class="value">{{patient.PhoneNumber}}</span>
+                        </td>
+                    </tr>
+                </table>
+                <table style="width:100%">
+                    <tr>
+                        <td class="mc-mrn-special">
+                            {{patient.primaryIdentifier.identifier}}
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="mc-mrn-special">
+                            <img id="barcode" jsbarcode-value="{{patient.primaryIdentifier.identifier}}"
+                                jsbarcode-width="3" jsbarcode-height="80" jsbarcode-margin="0"
+                                jsbarcode-displayValue="false" jsbarcode-textAlign="left" jsbarcode-textMargin="0"
+                                jsbarcode-fontSize="10" />
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+</div>
+
+<script type="text/javascript" src="/bahmni_config/openmrs/apps/JsBarcode.all.min.js"></script>
+<script>
+    (function () {
+        JsBarcode("#barcode").init();
+    })();
+</script>
\ No newline at end of file
diff --git a/openmrs/apps/reports/reports.json b/openmrs/apps/reports/reports.json
index 1a92c7b4a..20152adee 100644
--- a/openmrs/apps/reports/reports.json
+++ b/openmrs/apps/reports/reports.json
@@ -172,6 +172,45 @@
             "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/testCount.sql"
         }
     },
+    "hospitalActivities": {
+        "name": "Hospital Activities - Number of Clients Served (New and Total)",
+        "type": "MRSGeneric",
+        "requiredPrivilege": "app:reports",
+        "config": {
+          "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/totalAdmittedPatients_and_totalbeds.sql"
+        }
+    },
+    "qsmtEmergencyReport": {
+        "name": "TBGH 24 hours QSMT Emergency report",
+        "type": "MRSGeneric",
+        "requiredPrivilege": "app:reports",
+        "config": {
+          "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/qsmt_emergency_report.sql"
+        }
+    },
+    "qsmtWardReport": {
+        "name": "TBGH 24 hours QSMT Ward Report list",
+        "type": "MRSGeneric",
+        "config": {
+        "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/liaisonReport.sql"
+        }
+    },
+    "qrstReport":{
+        "name": "TBGH 24 hours QSMT Ward report",
+        "type": "MRSGeneric",
+        "requiredPrivilege": "app:reports",
+        "config": {
+          "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/qrst.sql"
+        }
+    },
+    "bedOccupancyRate": {
+        "name": "Bed occupancy rate",
+        "type": "MRSGeneric",
+        "requiredPrivilege": "app:reports",
+        "config": {
+          "sqlPath": "/var/www/bahmni_config/openmrs/apps/reports/sql/bedOccupancyRate.sql"
+        }
+    },
     "bloodPressure": {
         "name": "Blood Pressure",
         "type": "obsCount",
@@ -405,6 +444,16 @@
             ]
         }
     },
+    "visitAggregateCount": {
+        "name": "Visit Aggregate Count Report",
+        "type": "VisitAggregateCount",
+        "requiredPrivilege": "app:reports",
+        "config": {
+                   "type": "VisitAggregateCountReport",
+                   "locationTagNames": ["Report Location"],
+                   "visitTypes": "OPD','Emergency Ward'"
+        }
+    },
     "patientReport": {
         "name": "Patient Information",
         "type": "PatientReport",
diff --git a/openmrs/apps/reports/sql/bedOccupancyRate.sql b/openmrs/apps/reports/sql/bedOccupancyRate.sql
new file mode 100644
index 000000000..8ad570a03
--- /dev/null
+++ b/openmrs/apps/reports/sql/bedOccupancyRate.sql
@@ -0,0 +1,13 @@
+SELECT 
+    location.name AS Reports, COUNT(bed_patient_assignment_map.bed_id) AS Bed_occupancy
+FROM
+    bed_location_map
+JOIN location on location.location_id = bed_location_map.location_id
+JOIN bed_patient_assignment_map on bed_patient_assignment_map.bed_id=bed_location_map.bed_id
+AND ((CAST(bed_patient_assignment_map.date_started AS DATE) <= '#startDate#'
+        AND (CAST(bed_patient_assignment_map.date_stopped AS DATE) IS Null)) 
+    OR (CAST(bed_patient_assignment_map.date_stopped AS DATE) = '#startDate#' OR 
+        CAST(bed_patient_assignment_map.date_stopped AS DATE) = '#endDate#')
+    OR ((CAST(bed_patient_assignment_map.date_started AS DATE) <= '#startDate#') AND
+        (CAST(bed_patient_assignment_map.date_stopped AS DATE) >= '#endDate#')))
+Group by bed_location_map.location_id;
\ No newline at end of file
diff --git a/openmrs/apps/reports/sql/liaisonReport.sql b/openmrs/apps/reports/sql/liaisonReport.sql
new file mode 100644
index 000000000..bf71c2c8f
--- /dev/null
+++ b/openmrs/apps/reports/sql/liaisonReport.sql
@@ -0,0 +1,23 @@
+
+
+select 'Lision (24)' as ServiceArea, 'number of admission to' as Data, location.name as Element, room.AM6Total as `Report 6AM`,room.AM6Total as `Report 6PM`,room.total as `Report Total`, '' as Remark
+from (select l.parent_location,
+IFNULL(SUM(CASE WHEN bpa.date_stopped is null && bpa.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00") THEN 1 ELSE 0 END),0) as AM6Total,
+IFNULL(SUM(CASE WHEN bpa.date_stopped is null && bpa.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00") THEN 1 ELSE 0 END),0) as PM6Total,
+IFNULL(SUM(CASE WHEN bpa.date_stopped is null && CAST(bpa.date_started AS DATE) BETWEEN '#startDate#' AND '#endDate#' THEN 1 ELSE 0 END),0) as total
+from bed_patient_assignment_map bpa
+join bed_location_map blm on blm.bed_id=bpa.bed_id
+join location l on l.location_id=blm.location_id
+group by l.parent_location) as room 
+Join location on room.parent_location = location.location_id
+union
+select 'Lision (24)' as ServiceArea, 'number of Discharge to' as Data, location.name as Element, room.AM6Total as `Report 6AM`,room.AM6Total as `Report 6PM`,room.total as `Report Total`, '' as Remark
+from (select l.parent_location,
+IFNULL(SUM(CASE WHEN bpa.date_stopped && bpa.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00") THEN 1 ELSE 0 END),0) as AM6Total,
+IFNULL(SUM(CASE WHEN bpa.date_stopped && bpa.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00") THEN 1 ELSE 0 END),0) as PM6Total,
+IFNULL(SUM(CASE WHEN bpa.date_stopped && CAST(bpa.date_started AS DATE) BETWEEN '#startDate#' AND '#endDate#' THEN 1 ELSE 0 END),0) as total
+from bed_patient_assignment_map bpa
+join bed_location_map blm on blm.bed_id=bpa.bed_id
+join location l on l.location_id=blm.location_id
+group by l.parent_location) as room 
+Join location on room.parent_location = location.location_id
\ No newline at end of file
diff --git a/openmrs/apps/reports/sql/qrst.sql b/openmrs/apps/reports/sql/qrst.sql
new file mode 100644
index 000000000..9575df8e9
--- /dev/null
+++ b/openmrs/apps/reports/sql/qrst.sql
@@ -0,0 +1,10 @@
+select 'Lision (24)' as ServiceArea, 'number of admission to' as Data1, location.name as Element, room.AM6Total as Report6AM,room.AM6Total as Report6PM,room.total as ReportTotal, '' as Remark
+from (select l.parent_location,
+IFNULL(SUM(CASE WHEN bpa.date_stopped is null && bpa.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00") THEN 1 ELSE 0 END),0) as AM6Total,
+IFNULL(SUM(CASE WHEN bpa.date_stopped is null && bpa.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00") THEN 1 ELSE 0 END),0) as PM6Total,
+IFNULL(SUM(CASE WHEN bpa.date_stopped is null && CAST(bpa.date_started AS DATE) BETWEEN '#startDate#' AND '#endDate#' THEN 1 ELSE 0 END),0) as total
+from bed_patient_assignment_map as bpa
+join bed_location_map as blm on blm.bed_id=bpa.bed_id
+join location as l on l.location_id=blm.location_id
+group by l.parent_location) as room 
+Join location on room.parent_location = location.location_id;
\ No newline at end of file
diff --git a/openmrs/apps/reports/sql/qsmt_emergency_report.sql b/openmrs/apps/reports/sql/qsmt_emergency_report.sql
new file mode 100644
index 000000000..d739492c9
--- /dev/null
+++ b/openmrs/apps/reports/sql/qsmt_emergency_report.sql
@@ -0,0 +1,96 @@
+SELECT 
+    *
+FROM
+    (SELECT 
+        a.name AS `Service Areas`,
+            'Total cases seen(24hr)' AS `Data elements`,
+            IFNULL(SUM(if(a.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 12:00:00"), 1, 0)),0) AS `Report 6AM`, 
+			IFNULL(SUM(if(a.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 12:00:01") AND date_format('#endDate#', "%Y-%m-%d 23:59:59"), 1, 0)),0) AS `Report 6PM`, 
+           -- IFNULL(SUM(IF(a.date_started BETWEEN DATE_FORMAT('2020-08-04 00:09:26', '%Y-%m-%d 12:00:01') AND DATE_FORMAT('2020-09-04 00:09:26', '%Y-%m-%d 23:59:59'), 1, 0)), 0) AS `Report 6PM`,
+            COUNT(a.location_id) AS Total,
+            '' AS Remark
+    FROM
+        (SELECT 
+        bpam.patient_id,
+            bpam.date_started,
+            bpam.date_stopped,
+            bpam.bed_id,
+            blm.location_id,
+            l.name,
+            l.parent_location
+    FROM
+        bed_patient_assignment_map bpam
+    JOIN bed_location_map blm ON bpam.bed_id = blm.bed_id
+    JOIN location l ON l.location_id = blm.location_id
+        AND l.parent_location = (SELECT 
+            location_id
+        FROM
+            location
+        WHERE
+            location.name = 'Emergency Ward')
+    WHERE
+       -- bpam.date_started BETWEEN DATE_FORMAT('2020-08-04 00:09:26', '%Y-%m-%d 00:00:00') AND DATE_FORMAT('2020-09-04 00:09:26', '%Y-%m-%d 23:59:59')) AS a
+    bpam.date_started BETWEEN date_format('#startDate#', "%Y-%m-%d 00:00:00") AND date_format('#endDate#', "%Y-%m-%d 23:59:59")) AS a
+    GROUP BY a.location_id UNION SELECT 
+        a.name AS `Service Areas`,
+            'Total Number of kept cases' AS `Data elements`,
+            '-' AS `Report 6AM`, 
+    '-' AS `Report 6PM`, 
+            COUNT(a.location_id) AS Total,
+            '' AS Remark
+    FROM
+        (SELECT 
+        bpam.patient_id,
+            bpam.date_started,
+            bpam.date_stopped,
+            bpam.bed_id,
+            blm.location_id,
+            l.name,
+            l.parent_location
+    FROM
+        bed_patient_assignment_map bpam
+    JOIN bed_location_map blm ON bpam.bed_id = blm.bed_id
+    JOIN location l ON l.location_id = blm.location_id
+        AND l.parent_location = (SELECT 
+            location_id
+        FROM
+            location
+        WHERE
+            location.name = 'Emergency Ward')
+    WHERE
+        bpam.date_started < DATE_FORMAT('#startDate#', '%Y-%m-%d 00:00:00')
+            AND (bpam.date_stopped BETWEEN DATE_FORMAT('#startDate#', '%Y-%m-%d 23:59:59') 
+            AND DATE_FORMAT('#endDate#', '%Y-%m-%d 23:59:59')
+            OR bpam.date_stopped > DATE_FORMAT('#endDate#', '%Y-%m-%d 23:59:59'))) AS a
+    GROUP BY a.location_id UNION SELECT 
+        a.name AS `Service Areas`,
+            'Number of cases with > 24hr stay' AS `Data elements`,
+            '-' AS `Report 6AM`,
+            '-' AS `Report 6PM`,
+            COUNT(a.location_id) AS Total,
+            '' AS Remark
+    FROM
+        (SELECT 
+        bpam.patient_id,
+            bpam.date_started,
+            bpam.date_stopped,
+            bpam.bed_id,
+            blm.location_id,
+            l.name,
+            l.parent_location
+    FROM
+        bed_patient_assignment_map bpam
+    JOIN bed_location_map blm ON bpam.bed_id = blm.bed_id
+    JOIN location l ON l.location_id = blm.location_id
+        AND l.parent_location = (SELECT 
+            location_id
+        FROM
+            location
+        WHERE
+            location.name = 'Emergency Ward')
+    WHERE
+        bpam.date_started BETWEEN DATE_FORMAT('#startDate#', '%Y-%m-%d 00:00:00') 
+        AND DATE_FORMAT('#endDate#', '%Y-%m-%d 23:59:59')
+            AND bpam.date_stopped > DATE_FORMAT('#endDate#', '%Y-%m-%d 23:59:59')) AS a
+    GROUP BY a.location_id) AS b
+ORDER BY b.`Service Areas`
\ No newline at end of file
diff --git a/openmrs/apps/reports/sql/totalAdmittedPatients_and_totalbeds.sql b/openmrs/apps/reports/sql/totalAdmittedPatients_and_totalbeds.sql
new file mode 100644
index 000000000..8e55925b3
--- /dev/null
+++ b/openmrs/apps/reports/sql/totalAdmittedPatients_and_totalbeds.sql
@@ -0,0 +1,23 @@
+SELECT 
+    'Total Patients Admitted' AS Reports, COUNT(*) AS Count
+FROM
+    person
+        JOIN
+    visit ON visit.patient_id = person.person_id
+        AND CAST(visit.date_stopped AS DATE) BETWEEN '#startDate#' AND '#endDate#'
+        JOIN
+    visit_attribute AS va ON va.visit_id = visit.visit_id
+        AND va.value_reference = 'IPD'
+        LEFT JOIN
+    visit_attribute_type vat ON vat.visit_attribute_type_id = va.attribute_type_id
+        AND vat.name = 'Visit Status' 
+UNION SELECT 
+    'Number of beds' AS Reports, COUNT(*) AS Count
+FROM
+    bed_location_map 
+UNION SELECT 
+'Number of beds sanction ' AS Reports,property_value AS Count
+FROM global_property WHERE property='hospital.assigned.bed'
+ 
+
+
diff --git a/openmrs/i18n/adt/locale_en.json b/openmrs/i18n/adt/locale_en.json
index 748c1ffa2..ea7cdcbcb 100644
--- a/openmrs/i18n/adt/locale_en.json
+++ b/openmrs/i18n/adt/locale_en.json
@@ -13,10 +13,12 @@
   "HOME_DASHBOARD_KEY":"Home Dashboard",
 
   "DASHBOARD_TITLE_VITALS_KEY":"Vitals",
+  "DASHBOARD_TITLE_HISTORY_AND_EXAMINATIONS_KEY":"History and Examinations",
   "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY": "Patient Information",
   "DISCHARGE_SUMMARY_ADMISSION_DETAILS_KEY": "Admission Details",
   "DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY": "Navigation Links Control",
   "DASHBOARD_TITLE_DIAGNOSIS_KEY": "Diagnosis",
+  "DASHBOARD_TITLE_LAB_RESULTS_KEY": "Lab Results",
   "DASHBOARD_TITLE_ADMISSION_DETAILS_KEY": "Admission Details",
   "DASHBOARD_TITLE_DISPOSITION_KEY": "Disposition",
   "DASHBOARD_TAB_GENERAL_KEY": "General"
diff --git a/openmrs/i18n/appointments/locale_am.json b/openmrs/i18n/appointments/locale_am.json
new file mode 100644
index 000000000..13e2330d1
--- /dev/null
+++ b/openmrs/i18n/appointments/locale_am.json
@@ -0,0 +1,164 @@
+{
+  "APPOINTMENTS_MANAGE": "Manage Appointments",
+  "APPOINTMENTS_ADMIN": "Admin",
+  "APPOINTMENT_PROVIDER": "Provider",
+  "SUMMARY": "Summary",
+  "APPOINTMENT_LIST": "Appointments List",
+  "CALENDAR_VIEW": "Calendar",
+  "LIST_VIEW": "List view",
+  "NO_PROVIDER_COLUMN_KEY": "[No Provider]",
+  "DOB_LABEL": "Date of Birth",
+  "SERVICES": "Services",
+  "APPOINTMENT_SERVICE_SAVE": "Save",
+  "APPOINTMENT_SERVICE_ADD_NEW": "Add New Service",
+  "APPOINTMENT_SERVICE_ACTION_KEY": "Action",
+  "APPOINTMENT_SERVICE_EDIT_ACTION": "Edit",
+  "APPOINTMENT_SERVICE_DELETE_ACTION": "Delete",
+  "APPOINTMENT_SERVICE_CANCEL_ACTION": "Cancel",
+  "APPOINTMENT_SERVICE_NAME_KEY": "Service Name",
+  "PLACEHOLDER_SERVICE_NAME": "Enter a service name",
+  "APPOINTMENT_SERVICE_DESCRIPTION_KEY": "Description",
+  "PLACEHOLDER_SERVICE_DESCRIPTION": "Enter description",
+  "APPOINTMENT_SERVICE_DURATION_KEY": "Duration",
+  "PLACEHOLDER_SERVICE_DURATION": "Mins",
+  "APPOINTMENT_SERVICE_MAX_LOAD_KEY": "Max Load",
+  "PLACEHOLDER_SERVICE_MAX_LOAD": "Appointments limit",
+  "APPOINTMENT_SERVICE_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_SPECIALITY_KEY": "Speciality",
+  "PLACEHOLDER_SERVICE_SPECIALITY": "Select a speciality",
+  "APPOINTMENT_SERVICE_LOCATION_KEY": "Location",
+  "APPOINTMENT_SERVICE_LABEL_COLOUR_KEY": "Label Colour",
+  "PLACEHOLDER_SERVICE_LOCATION": "Select a location",
+  "APPOINTMENT_SERVICE_TYPE": "Service App. Type",
+  "APPOINTMENT_SERVICE_TYPE_ADD_NEW": "Add Service Appointment Type",
+  "APPOINTMENT_SERVICE_AVAILABILITY": "Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_ADD_NEW": "Add Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
+  "SUNDAY": "Su",
+  "MONDAY": "Mo",
+  "TUESDAY": "Tu",
+  "WEDNESDAY": "We",
+  "THURSDAY": "Th",
+  "FRIDAY": "Fr",
+  "SATURDAY": "Sa",
+  "APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
+  "APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
+  "ADD_AVAILABILITY": "ADD",
+  "CANCEL_KEY": "Cancel",
+  "OK_KEY": "Ok",
+  "CONFIRM_DELETE_AVAILABILITY": "There could be appointments booked for this service availability. Are you sure you want to proceed with deleting it?",
+  "CONFIRM_EDIT_SERVICE_MESSAGE_KEY": "There could be appointments booked against this service. Are you sure you want to save the changes?",
+  "APPOINTMENT_SERVICE_SAVE_SUCCESS": "Service saved successfully",
+  "APPOINTMENT_SAVE_SUCCESS": "Appointment saved successfully",
+  "NAVIGATION_CONFIRMATION_DIALOG_MESSAGE_KEY": "You may have unsaved changes, please choose an option",
+  "NAVIGATION_CONFIRMATION_OPTION_DONT_SAVE_KEY" : "Don't save",
+  "NAVIGATION_CONFIRMATION_OPTION_CANCEL_KEY" : "Stay on page",
+  "SAVE_CONFIRMATION_DIALOG_CONFLICT_KEY": "This patient already has an appointment booked at this time. Would you like to proceed or edit the timings?",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_SAVE_KEY" : "Proceed and save",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_CANCEL_KEY" : "Back to edit",
+  "DUPLICATE_SERVICE_NAME_ERROR_MESSAGE": "Service name already exists",
+  "TIME_SEQUENCE_ERROR_MESSAGE": "End time must be after Start time",
+  "OVERLAPPING_AVAILABILITY_ERROR_MESSAGE": "Seems like there is an overlap in the availability you are trying to add. Please correct it to proceed further",
+  "INVALID_SERVICE_FORM_ERROR_MESSAGE": "Please correct the values in the fields to proceed",
+  "INVALID_TIME_ERROR_MESSAGE": "Invalid start/end time. Expected format is hh:mm am/pm.",
+  "MESSAGE_DIALOG_OPTION_COPY": "Copy Error",
+  "MESSAGE_DIALOG_OPTION_OKAY": "Ok",
+  "ADD_SERVICE_APPOINTMENT_TYPE": "Add Service Appointment Type",
+  "ADD_NEW_TYPE": "Add new type",
+  "PLACEHOLDER_SERVICE_TYPE_NAME": "Service type name",
+  "ADD": "Add",
+  "DUPLICATE_SERVICE_APPOINTMENT_TYPE_ERROR_MESSAGE": "Service appointment type already exists.",
+  "APPOINTMENT_SERVICE_DELETE_SUCCESS_MESSAGE_KEY": "Service deleted successfully",
+  "APPOINTMENT_SERVICE_TYPE_DELETE_CONFIRMATION_DIALOG_MESSAGE_KEY": "There are appointments for this type in future, please cancel them before deleting this service appointment type.After deleting the service appt type, you will not be able to see any appts. for it",
+  "ADD_NEW_APPOINTMENT": "Add new appointment",
+  "APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Search",
+  "PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Name or ID",
+  "APPOINTMENT_CREATE_PATIENT_NAME": "Patient",
+  "APPOINTMENT_SERVICE": "Service",
+  "PLACEHOLDER_SERVICE": "Select a service",
+  "PLACEHOLDER_SERVICE_TYPE": "Select a service appointment type",
+  "PLACEHOLDER_CREATE_PROVIDER": "Select a provider",
+  "APPOINTMENT_DATE": "Date",
+  "APPOINTMENT_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_END_TIME_KEY": "End Time",
+  "PLACEHOLDER_APPOINTMENT_TIME_FORMAT": "Enter time as hh:mm am/pm",
+  "APPOINTMENT_CREATION_DATE_WARNING": "Date chosen is outside the availability of the service",
+  "APPOINTMENT_CREATION_START_TIME_WARNING": "Start time is outside the service available times",
+  "APPOINTMENT_CREATION_END_TIME_WARNING": "End time is outside the service available times",
+  "APPOINTMENT_CREATION_OUT_OF_RANGE_WARNING": "Selected time slots are outside the service available times",
+  "APPOINTMENT_CREATE_WALK_IN": "  Walk-in Appointment",
+  "APPOINTMENT_CREATE_NOTES": "Notes",
+  "PLACEHOLDER_CREATE_NOTES": "Enter appointment notes",
+  "APPOINTMENT_CREATE_SAVE": "Save",
+  "APPOINTMENT_CREATE_CANCEL": "Cancel",
+  "APPOINTMENT_CREATE_SLOT": "Slots",
+  "APPOINTMENT_CREATE_BOOKED": "Booked",
+  "APPOINTMENT_CREATE_AVAL": "Available",
+  "APPOINTMENT_CREATE_OUTOF": "out of",
+  "APPOINTMENT_PATIENT_ID": "Patient ID",
+  "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
+  "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
+  "APPOINTMENT_WALK_IN": "Walk In",
+  "APPOINTMENT_STATUS": "Status",
+  "APPOINTMENT_COMMENTS": "Comments",
+  "CHECK_IN_APPOINTMENT": "Check-in",
+  "COMPLETE_APPOINTMENT": "Complete",
+  "MISSED_APPOINTMENT": "Missed",
+  "EDIT_APPOINTMENT": "Edit",
+  "CANCEL_APPOINTMENT": "Cancel",
+  "CURRENT_DATE": "Today",
+  "DAY": "Day",
+  "WEEK": "Week",
+  "TOTAL_KEY": "Total",
+  "MISSED_KEY": "missed",
+  "PLACEHOLDER_SELECT_PATIENT": "Select a patient",
+  "APPOINTMENT_SLOT": "Slot",
+  "EDIT_APPOINTMENT_KEY": "Edit Appointment",
+  "APPLY_FILTER_KEY": "Apply Filter",
+  "FILTER_KEY": "Filter",
+  "APPOINTMENT_STATUS_KEY": "Appointment status",
+  "APPOINTMENT_SERVICE_KEY": "Service",
+  "APPOINTMENT_SHOW_SELECTED_KEY": "Show selected",
+  "APPOINTMENT_ENTER_STATUS_NAME_KEY": "Enter status Name",
+  "RESET_KEY": "Reset",
+  "BACK_LABEL": "Back",
+  "PATIENT_LIST_VIEW_SEARCH_HEADER": "Search",
+  "NO_APPOINTMENT_LIST_VIEW": "No appointments found",
+  "NO_APPOINTMENT_CALENDAR_VIEW": "No appointments found",
+  "SEARCH_KEY": "Search ...",
+  "APPOINTMENT_ENTER_PROVIDER_NAME_KEY": "Enter provider name",
+  "NO_SPECIALITY_KEY": "No Speciality",
+  "PLACEHOLDER_SERVICE_TYPE_DURATION_MIN": "min",
+  "APPOINTMENT_STATUS_CHANGE_CONFIRM_MESSAGE": "Are you sure, you want to mark appointment as {{toStatus}}?",
+  "CHECK_IN_APPOINTMENT_TIME_VALIDATION": "Enter valid check in time.",
+  "YES_KEY": "Yes",
+  "NO_KEY": "No",
+  "UNDO_CHECK_IN_APPOINTMENT": "Undo Check-in",
+  "RESET_APPOINTMENT": "Reset",
+  "APPOINTMENT_UNDO_CHECKIN_CONFIRM_MESSAGE": "Are you sure, you want to undo Check-in?",
+  "APPOINTMENT_RESET_CONFIRM_MESSAGE": "Are you sure, you want to reset the status to Scheduled?",
+  "APPOINTMENT_ADDITIONAL_INFO": "Additional Info",
+  "APPOINTMENT_STATUS_CHANGE_SUCCESS_MESSAGE": "Successfully changed appointment status to {{toStatus}}",
+  "NO_RESULTS_FOUND": "No results found",
+  "PRIVILEGE_REQUIRED": "User is logged in but doesn't have the relevant privilege",
+  "NO_FULFILMENT_MESSAGE": "No observations captured for this order.",
+  "NO_NAVIGATION_LINKS_AVAILABLE_MESSAGE": "No navigation links available.",
+  "ACCEPT":"Accept",
+  "SELECT_VALUE_FROM_AUTOCOMPLETE_DEFAULT_MESSAGE": "Please select a value from auto complete",
+  "CONCEPT_NOT_FOUND_MESSAGE": "concept not found.",
+  "NO_OBS_FOUND_MESSAGE": "No observations made for this patient.",
+  "TIME_OF_BIRTH_LABEL": "Time of Birth",
+  "PATIENT_PROFILE_RELATIONSHIPS_LABEL": "Relationships",
+  "BROWSER_DOES_NOT_SUPPORT_VIDEO_TAG_MESSAGE":"Your browser does not support the video tag.",
+  "YEARS_LABEL": "Years",
+  "CHOOSE_ANSWER_FROM_DROPDOWN_LABEL": "Choose Answer",
+  "DELETE_LABEL": "Delete",
+  "EDIT_LABEL": "Edit",
+  "SELECT_APPOINTMENT_PROVIDER": "Select Provider",
+  "INVITED_PROVIDERS": "Invitees",
+  "APPOINTMENT_PROVIDER_REMOVE_ACTION": "Remove"
+}
diff --git a/openmrs/i18n/appointments/locale_en.json b/openmrs/i18n/appointments/locale_en.json
new file mode 100644
index 000000000..39f9133fa
--- /dev/null
+++ b/openmrs/i18n/appointments/locale_en.json
@@ -0,0 +1,160 @@
+{
+  "APPOINTMENTS_MANAGE": "Manage Appointments",
+  "APPOINTMENTS_ADMIN": "Admin",
+  "APPOINTMENT_PROVIDER": "Provider",
+  "SUMMARY": "Summary",
+  "APPOINTMENT_LIST": "Appointments List",
+  "CALENDAR_VIEW": "Calendar",
+  "LIST_VIEW": "List view",
+  "NO_PROVIDER_COLUMN_KEY": "[No Provider]",
+  "DOB_LABEL": "Date of Birth",
+  "SERVICES": "Services",
+  "APPOINTMENT_SERVICE_SAVE": "Save",
+  "APPOINTMENT_SERVICE_ADD_NEW": "Add New Service",
+  "APPOINTMENT_SERVICE_ACTION_KEY": "Action",
+  "APPOINTMENT_SERVICE_EDIT_ACTION": "Edit",
+  "APPOINTMENT_SERVICE_DELETE_ACTION": "Delete",
+  "APPOINTMENT_SERVICE_CANCEL_ACTION": "Cancel",
+  "APPOINTMENT_SERVICE_NAME_KEY": "Service Name",
+  "PLACEHOLDER_SERVICE_NAME": "Enter a service name",
+  "APPOINTMENT_SERVICE_DESCRIPTION_KEY": "Description",
+  "PLACEHOLDER_SERVICE_DESCRIPTION": "Enter description",
+  "APPOINTMENT_SERVICE_DURATION_KEY": "Duration",
+  "PLACEHOLDER_SERVICE_DURATION": "Mins",
+  "APPOINTMENT_SERVICE_MAX_LOAD_KEY": "Max Load",
+  "PLACEHOLDER_SERVICE_MAX_LOAD": "Appointments limit",
+  "APPOINTMENT_SERVICE_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_SPECIALITY_KEY": "Speciality",
+  "PLACEHOLDER_SERVICE_SPECIALITY": "Select a speciality",
+  "APPOINTMENT_SERVICE_LOCATION_KEY": "Location",
+  "APPOINTMENT_SERVICE_LABEL_COLOUR_KEY": "Label Colour",
+  "PLACEHOLDER_SERVICE_LOCATION": "Select a location",
+  "APPOINTMENT_SERVICE_TYPE": "Service App. Type",
+  "APPOINTMENT_SERVICE_TYPE_ADD_NEW": "Add Service Appointment Type",
+  "APPOINTMENT_SERVICE_AVAILABILITY": "Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_ADD_NEW": "Add Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
+  "SUNDAY": "Su",
+  "MONDAY": "Mo",
+  "TUESDAY": "Tu",
+  "WEDNESDAY": "We",
+  "THURSDAY": "Th",
+  "FRIDAY": "Fr",
+  "SATURDAY": "Sa",
+  "APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
+  "APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
+  "ADD_AVAILABILITY": "ADD",
+  "CANCEL_KEY": "Cancel",
+  "OK_KEY": "Ok",
+  "CONFIRM_DELETE_AVAILABILITY": "There could be appointments booked for this service availability. Are you sure you want to proceed with deleting it?",
+  "CONFIRM_EDIT_SERVICE_MESSAGE_KEY": "There could be appointments booked against this service. Are you sure you want to save the changes?",
+  "APPOINTMENT_SERVICE_SAVE_SUCCESS": "Service saved successfully",
+  "APPOINTMENT_SAVE_SUCCESS": "Appointment saved successfully",
+  "NAVIGATION_CONFIRMATION_DIALOG_MESSAGE_KEY": "You may have unsaved changes, please choose an option",
+  "NAVIGATION_CONFIRMATION_OPTION_DONT_SAVE_KEY" : "Don't save",
+  "NAVIGATION_CONFIRMATION_OPTION_CANCEL_KEY" : "Stay on page",
+  "SAVE_CONFIRMATION_DIALOG_CONFLICT_KEY": "This patient already has an appointment booked at this time. Would you like to proceed or edit the timings?",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_SAVE_KEY" : "Proceed and save",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_CANCEL_KEY" : "Back to edit",
+  "DUPLICATE_SERVICE_NAME_ERROR_MESSAGE": "Service name already exists",
+  "TIME_SEQUENCE_ERROR_MESSAGE": "End time must be after Start time",
+  "OVERLAPPING_AVAILABILITY_ERROR_MESSAGE": "Seems like there is an overlap in the availability you are trying to add. Please correct it to proceed further",
+  "INVALID_SERVICE_FORM_ERROR_MESSAGE": "Please correct the values in the fields to proceed",
+  "INVALID_TIME_ERROR_MESSAGE": "Invalid start/end time. Expected format is hh:mm am/pm.",
+  "MESSAGE_DIALOG_OPTION_COPY": "Copy Error",
+  "MESSAGE_DIALOG_OPTION_OKAY": "Ok",
+  "ADD_SERVICE_APPOINTMENT_TYPE": "Add Service Appointment Type",
+  "ADD_NEW_TYPE": "Add new type",
+  "PLACEHOLDER_SERVICE_TYPE_NAME": "Service type name",
+  "ADD": "Add",
+  "DUPLICATE_SERVICE_APPOINTMENT_TYPE_ERROR_MESSAGE": "Service appointment type already exists.",
+  "APPOINTMENT_SERVICE_DELETE_SUCCESS_MESSAGE_KEY": "Service deleted successfully",
+  "APPOINTMENT_SERVICE_TYPE_DELETE_CONFIRMATION_DIALOG_MESSAGE_KEY": "There are appointments for this type in future, please cancel them before deleting this service appointment type.After deleting the service appt type, you will not be able to see any appts. for it",
+  "ADD_NEW_APPOINTMENT": "Add new appointment",
+  "APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Search",
+  "PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Name or ID",
+  "APPOINTMENT_CREATE_PATIENT_NAME": "Patient",
+  "APPOINTMENT_SERVICE": "Service",
+  "PLACEHOLDER_SERVICE": "Select a service",
+  "PLACEHOLDER_SERVICE_TYPE": "Select a service appointment type",
+  "PLACEHOLDER_CREATE_PROVIDER": "Select a provider",
+  "APPOINTMENT_DATE": "Date",
+  "APPOINTMENT_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_END_TIME_KEY": "End Time",
+  "PLACEHOLDER_APPOINTMENT_TIME_FORMAT": "Enter time as hh:mm am/pm",
+  "APPOINTMENT_CREATION_DATE_WARNING": "Date chosen is outside the availability of the service",
+  "APPOINTMENT_CREATION_START_TIME_WARNING": "Start time is outside the service available times",
+  "APPOINTMENT_CREATION_END_TIME_WARNING": "End time is outside the service available times",
+  "APPOINTMENT_CREATION_OUT_OF_RANGE_WARNING": "Selected time slots are outside the service available times",
+  "APPOINTMENT_CREATE_WALK_IN": "  Walk-in Appointment",
+  "APPOINTMENT_CREATE_FULL_DAY": "  Whole Day",
+  "APPOINTMENT_CREATE_NOTES": "Notes",
+  "PLACEHOLDER_CREATE_NOTES": "Enter appointment notes",
+  "APPOINTMENT_CREATE_SAVE": "Save",
+  "APPOINTMENT_CREATE_CANCEL": "Cancel",
+  "APPOINTMENT_CREATE_SLOT": "Slots",
+  "APPOINTMENT_CREATE_BOOKED": "Booked",
+  "APPOINTMENT_CREATE_AVAL": "Available",
+  "APPOINTMENT_CREATE_OUTOF": "out of",
+  "APPOINTMENT_PATIENT_ID": "Patient ID",
+  "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
+  "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
+  "APPOINTMENT_WALK_IN": "Walk In",
+  "APPOINTMENT_STATUS": "Status",
+  "APPOINTMENT_COMMENTS": "Comments",
+  "CHECK_IN_APPOINTMENT": "Check-in",
+  "COMPLETE_APPOINTMENT": "Complete",
+  "MISSED_APPOINTMENT": "Missed",
+  "EDIT_APPOINTMENT": "Edit",
+  "CANCEL_APPOINTMENT": "Cancel",
+  "CURRENT_DATE": "Today",
+  "TOTAL_KEY": "Total",
+  "MISSED_KEY": "missed",
+  "PLACEHOLDER_SELECT_PATIENT": "Select a patient",
+  "APPOINTMENT_SLOT": "Slot",
+  "APPOINTMENT_CREATOR": "Created By",
+  "APPOINTMENT_DATE_CREATED": "Created Date",
+  "EDIT_APPOINTMENT_KEY": "Edit Appointment",
+  "APPLY_FILTER_KEY": "Apply Filter",
+  "FILTER_KEY": "Filter",
+  "APPOINTMENT_STATUS_KEY": "Appointment status",
+  "APPOINTMENT_SERVICE_KEY": "Service",
+  "APPOINTMENT_SHOW_SELECTED_KEY": "Show selected",
+  "APPOINTMENT_ENTER_STATUS_NAME_KEY": "Enter status Name",
+  "RESET_KEY": "Reset",
+  "BACK_LABEL": "Back",
+  "PATIENT_LIST_VIEW_SEARCH_HEADER": "Search",
+  "NO_APPOINTMENT_LIST_VIEW": "No appointments found",
+  "NO_APPOINTMENT_CALENDAR_VIEW": "No appointments found",
+  "SEARCH_KEY": "Search ...",
+  "APPOINTMENT_ENTER_PROVIDER_NAME_KEY": "Enter provider name",
+  "NO_SPECIALITY_KEY": "No Speciality",
+  "PLACEHOLDER_SERVICE_TYPE_DURATION_MIN": "min",
+  "APPOINTMENT_STATUS_CHANGE_CONFIRM_MESSAGE": "Are you sure, you want to mark appointment as {{toStatus}}?",
+  "CHECK_IN_APPOINTMENT_TIME_VALIDATION": "Enter valid check in time.",
+  "YES_KEY": "Yes",
+  "NO_KEY": "No",
+  "UNDO_CHECK_IN_APPOINTMENT": "Undo Check-in",
+  "APPOINTMENT_UNDO_CHECKIN_CONFIRM_MESSAGE": "Are you sure, you want to undo Check-in?",
+  "APPOINTMENT_ADDITIONAL_INFO": "Additional Info",
+  "APPOINTMENT_STATUS_CHANGE_SUCCESS_MESSAGE": "Successfully changed appointment status to {{toStatus}}",
+  "NO_RESULTS_FOUND": "No results found",
+  "PRIVILEGE_REQUIRED": "User is logged in but doesn't have the relevant privilege",
+  "NO_FULFILMENT_MESSAGE": "No observations captured for this order.",
+  "NO_NAVIGATION_LINKS_AVAILABLE_MESSAGE": "No navigation links available.",
+  "ACCEPT":"Accept",
+  "SELECT_VALUE_FROM_AUTOCOMPLETE_DEFAULT_MESSAGE": "Please select a value from auto complete",
+  "CONCEPT_NOT_FOUND_MESSAGE": "concept not found.",
+  "NO_OBS_FOUND_MESSAGE": "No observations made for this patient.",
+  "TIME_OF_BIRTH_LABEL": "Time of Birth",
+  "PATIENT_PROFILE_RELATIONSHIPS_LABEL": "Relationships",
+  "BROWSER_DOES_NOT_SUPPORT_VIDEO_TAG_MESSAGE":"Your browser does not support the video tag.",
+  "YEARS_LABEL": "Years",
+  "CHOOSE_ANSWER_FROM_DROPDOWN_LABEL": "Choose Answer",
+  "DELETE_LABEL": "Delete",
+  "EDIT_LABEL": "Edit"
+}
diff --git a/openmrs/i18n/appointments/locale_es.json b/openmrs/i18n/appointments/locale_es.json
new file mode 100644
index 000000000..13f3363f5
--- /dev/null
+++ b/openmrs/i18n/appointments/locale_es.json
@@ -0,0 +1,141 @@
+{
+  "APPOINTMENTS_MANAGE": "Manage Appointments",
+  "APPOINTMENTS_ADMIN": "Admin",
+  "APPOINTMENT_PROVIDER": "Provider",
+  "SUMMARY": "Summary",
+  "APPOINTMENT_LIST": "Appointments List",
+  "CALENDAR_VIEW": "Calendar",
+  "LIST_VIEW": "List view",
+  "NO_PROVIDER_COLUMN_KEY": "[No Provider]",
+  "SERVICES": "Services",
+  "APPOINTMENT_SERVICE_SAVE": "Save",
+  "APPOINTMENT_SERVICE_ADD_NEW": "Add New Service",
+  "APPOINTMENT_SERVICE_ACTION_KEY": "Action",
+  "APPOINTMENT_SERVICE_EDIT_ACTION": "Edit",
+  "APPOINTMENT_SERVICE_DELETE_ACTION": "Delete",
+  "APPOINTMENT_SERVICE_CANCEL_ACTION": "Cancel",
+  "APPOINTMENT_SERVICE_NAME_KEY": "Service Name",
+  "PLACEHOLDER_SERVICE_NAME": "Enter a service name",
+  "APPOINTMENT_SERVICE_DESCRIPTION_KEY": "Description",
+  "PLACEHOLDER_SERVICE_DESCRIPTION": "Enter description",
+  "APPOINTMENT_SERVICE_DURATION_KEY": "Duration",
+  "PLACEHOLDER_SERVICE_DURATION": "Mins",
+  "APPOINTMENT_SERVICE_MAX_LOAD_KEY": "Max Load",
+  "PLACEHOLDER_SERVICE_MAX_LOAD": "Appointments limit",
+  "APPOINTMENT_SERVICE_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_SPECIALITY_KEY": "Speciality",
+  "PLACEHOLDER_SERVICE_SPECIALITY": "Select a speciality",
+  "APPOINTMENT_SERVICE_LOCATION_KEY": "Location",
+  "APPOINTMENT_SERVICE_LABEL_COLOUR_KEY": "Label Colour",
+  "PLACEHOLDER_SERVICE_LOCATION": "Select a location",
+  "APPOINTMENT_SERVICE_TYPE": "Service App. Type",
+  "APPOINTMENT_SERVICE_TYPE_ADD_NEW": "Add Service Appointment Type",
+  "APPOINTMENT_SERVICE_AVAILABILITY": "Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_ADD_NEW": "Add Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
+  "SUNDAY": "Su",
+  "MONDAY": "Mo",
+  "TUESDAY": "Tu",
+  "WEDNESDAY": "We",
+  "THURSDAY": "Th",
+  "FRIDAY": "Fr",
+  "SATURDAY": "Sa",
+  "APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
+  "APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
+  "ADD_AVAILABILITY": "ADD",
+  "CANCEL_KEY": "Cancel",
+  "OK_KEY": "Ok",
+  "CONFIRM_DELETE_AVAILABILITY": "There could be appointments booked for this service availability. Are you sure you want to proceed with deleting it?",
+  "CONFIRM_EDIT_SERVICE_MESSAGE_KEY": "There could be appointments booked against this service. Are you sure you want to save the changes?",
+  "APPOINTMENT_SERVICE_SAVE_SUCCESS": "Service saved successfully",
+  "APPOINTMENT_SAVE_SUCCESS": "Appointment saved successfully",
+  "NAVIGATION_CONFIRMATION_DIALOG_MESSAGE_KEY": "You may have unsaved changes, please choose an option",
+  "NAVIGATION_CONFIRMATION_OPTION_DONT_SAVE_KEY" : "Don't save",
+  "NAVIGATION_CONFIRMATION_OPTION_CANCEL_KEY" : "Stay on page",
+  "SAVE_CONFIRMATION_DIALOG_CONFLICT_KEY": "This patient already has an appointment booked at this time. Would you like to proceed or edit the timings?",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_SAVE_KEY" : "Proceed and save",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_CANCEL_KEY" : "Back to edit",
+  "DUPLICATE_SERVICE_NAME_ERROR_MESSAGE": "Service name already exists",
+  "TIME_SEQUENCE_ERROR_MESSAGE": "End time must be after Start time",
+  "OVERLAPPING_AVAILABILITY_ERROR_MESSAGE": "Seems like there is an overlap in the availability you are trying to add. Please correct it to proceed further",
+  "INVALID_SERVICE_FORM_ERROR_MESSAGE": "Please correct the values in the fields to proceed",
+  "INVALID_TIME_ERROR_MESSAGE": "Invalid start/end time. Expected format is hh:mm am/pm.",
+  "MESSAGE_DIALOG_OPTION_COPY": "Copy Error",
+  "MESSAGE_DIALOG_OPTION_OKAY": "Ok",
+  "ADD_SERVICE_APPOINTMENT_TYPE": "Add Service Appointment Type",
+  "ADD_NEW_TYPE": "Add new type",
+  "PLACEHOLDER_SERVICE_TYPE_NAME": "Service type name",
+  "ADD": "Add",
+  "DUPLICATE_SERVICE_APPOINTMENT_TYPE_ERROR_MESSAGE": "Service appointment type already exists.",
+  "APPOINTMENT_SERVICE_DELETE_SUCCESS_MESSAGE_KEY": "Service deleted successfully",
+  "APPOINTMENT_SERVICE_TYPE_DELETE_CONFIRMATION_DIALOG_MESSAGE_KEY": "There are appointments for this type in future, please cancel them before deleting this service appointment type.After deleting the service appt type, you will not be able to see any appts. for it",
+  "ADD_NEW_APPOINTMENT": "Add new appointment",
+  "APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Search",
+  "PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Name or ID",
+  "APPOINTMENT_CREATE_PATIENT_NAME": "Patient",
+  "APPOINTMENT_SERVICE": "Service",
+  "PLACEHOLDER_SERVICE": "Select a service",
+  "PLACEHOLDER_SERVICE_TYPE": "Select a service appointment type",
+  "PLACEHOLDER_CREATE_PROVIDER": "Select a provider",
+  "APPOINTMENT_DATE": "Date",
+  "APPOINTMENT_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_END_TIME_KEY": "End Time",
+  "PLACEHOLDER_APPOINTMENT_TIME_FORMAT": "Enter time as hh:mm am/pm",
+  "APPOINTMENT_CREATION_DATE_WARNING": "Date chosen is outside the availability of the service",
+  "APPOINTMENT_CREATION_START_TIME_WARNING": "Start time is outside the service available times",
+  "APPOINTMENT_CREATION_END_TIME_WARNING": "End time is outside the service available times",
+  "APPOINTMENT_CREATION_OUT_OF_RANGE_WARNING": "Selected time slots are outside the service available times",
+  "APPOINTMENT_CREATE_WALK_IN": "  Walk-in Appointment",
+  "APPOINTMENT_CREATE_NOTES": "Notes",
+  "PLACEHOLDER_CREATE_NOTES": "Enter appointment notes",
+  "APPOINTMENT_CREATE_SAVE": "Save",
+  "APPOINTMENT_CREATE_CANCEL": "Cancel",
+  "APPOINTMENT_CREATE_SLOT": "Slots",
+  "APPOINTMENT_CREATE_BOOKED": "Booked",
+  "APPOINTMENT_CREATE_AVAL": "Available",
+  "APPOINTMENT_CREATE_OUTOF": "out of",
+  "APPOINTMENT_PATIENT_ID": "Patient ID",
+  "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
+  "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
+  "APPOINTMENT_WALK_IN": "Walk In",
+  "APPOINTMENT_STATUS": "Status",
+  "APPOINTMENT_COMMENTS": "Comments",
+  "CHECK_IN_APPOINTMENT": "Check-in",
+  "COMPLETE_APPOINTMENT": "Complete",
+  "MISSED_APPOINTMENT": "Missed",
+  "EDIT_APPOINTMENT": "Edit",
+  "CANCEL_APPOINTMENT": "Cancel",
+  "CURRENT_DATE": "Today",
+  "TOTAL_KEY": "Total",
+  "MISSED_KEY": "missed",
+  "PLACEHOLDER_SELECT_PATIENT": "Select a patient",
+  "APPOINTMENT_SLOT": "Slot",
+  "EDIT_APPOINTMENT_KEY": "Edit Appointment",
+  "APPLY_FILTER_KEY": "Apply Filter",
+  "FILTER_KEY": "Filter",
+  "APPOINTMENT_STATUS_KEY": "Appointment status",
+  "APPOINTMENT_SERVICE_KEY": "Service",
+  "APPOINTMENT_SHOW_SELECTED_KEY": "Show selected",
+  "APPOINTMENT_ENTER_STATUS_NAME_KEY": "Enter status Name",
+  "RESET_KEY": "Reset",
+  "BACK_LABEL": "Back",
+  "PATIENT_LIST_VIEW_SEARCH_HEADER": "Search",
+  "NO_APPOINTMENT_LIST_VIEW": "No appointments found",
+  "NO_APPOINTMENT_CALENDAR_VIEW": "No appointments found",
+  "SEARCH_KEY": "Search ...",
+  "APPOINTMENT_ENTER_PROVIDER_NAME_KEY": "Enter provider name",
+  "NO_SPECIALITY_KEY": "No Speciality",
+  "PLACEHOLDER_SERVICE_TYPE_DURATION_MIN": "min",
+  "APPOINTMENT_STATUS_CHANGE_CONFIRM_MESSAGE": "Are you sure, you want to mark appointment as {{toStatus}}?",
+  "CHECK_IN_APPOINTMENT_TIME_VALIDATION": "Enter valid check in time.",
+  "YES_KEY": "Yes",
+  "NO_KEY": "No",
+  "UNDO_CHECK_IN_APPOINTMENT": "Undo Check-in",
+  "APPOINTMENT_UNDO_CHECKIN_CONFIRM_MESSAGE": "Are you sure, you want to undo Check-in?",
+  "APPOINTMENT_ADDITIONAL_INFO": "Additional Info",
+  "APPOINTMENT_STATUS_CHANGE_SUCCESS_MESSAGE": "Successfully changed appointment status to {{toStatus}}"
+}
diff --git a/openmrs/i18n/appointments/locale_fr.json b/openmrs/i18n/appointments/locale_fr.json
new file mode 100644
index 000000000..d4f3f10f9
--- /dev/null
+++ b/openmrs/i18n/appointments/locale_fr.json
@@ -0,0 +1,141 @@
+{
+  "APPOINTMENTS_MANAGE": "Manage Appointments",
+  "APPOINTMENTS_ADMIN": "Admin",
+  "APPOINTMENT_PROVIDER": "Provider",
+  "SUMMARY": "Résumé",
+  "APPOINTMENT_LIST": "Appointments List",
+  "CALENDAR_VIEW": "Calendar",
+  "LIST_VIEW": "List view",
+  "NO_PROVIDER_COLUMN_KEY": "[No Provider]",
+  "SERVICES": "Services",
+  "APPOINTMENT_SERVICE_SAVE": "Save",
+  "APPOINTMENT_SERVICE_ADD_NEW": "Ajouter une service",
+  "APPOINTMENT_SERVICE_ACTION_KEY": "Action",
+  "APPOINTMENT_SERVICE_EDIT_ACTION": "Modifier",
+  "APPOINTMENT_SERVICE_DELETE_ACTION": "Supprimer",
+  "APPOINTMENT_SERVICE_CANCEL_ACTION": "Annuler",
+  "APPOINTMENT_SERVICE_NAME_KEY": "Service Name",
+  "PLACEHOLDER_SERVICE_NAME": "Enter a service name",
+  "APPOINTMENT_SERVICE_DESCRIPTION_KEY": "Description",
+  "PLACEHOLDER_SERVICE_DESCRIPTION": "Enter description",
+  "APPOINTMENT_SERVICE_DURATION_KEY": "Duration",
+  "PLACEHOLDER_SERVICE_DURATION": "Mins",
+  "APPOINTMENT_SERVICE_MAX_LOAD_KEY": "Max Load",
+  "PLACEHOLDER_SERVICE_MAX_LOAD": "Appointments limit",
+  "APPOINTMENT_SERVICE_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_SPECIALITY_KEY": "Speciality",
+  "PLACEHOLDER_SERVICE_SPECIALITY": "Select a speciality",
+  "APPOINTMENT_SERVICE_LOCATION_KEY": "Location",
+  "APPOINTMENT_SERVICE_LABEL_COLOUR_KEY": "Label Colour",
+  "PLACEHOLDER_SERVICE_LOCATION": "Select a location",
+  "APPOINTMENT_SERVICE_TYPE": "Service App. Type",
+  "APPOINTMENT_SERVICE_TYPE_ADD_NEW": "Add Service Appointment Type",
+  "APPOINTMENT_SERVICE_AVAILABILITY": "Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_ADD_NEW": "Add Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
+  "SUNDAY": "Di",
+  "MONDAY": "Lu",
+  "TUESDAY": "Ma",
+  "WEDNESDAY": "Me",
+  "THURSDAY": "Je",
+  "FRIDAY": "Ve",
+  "SATURDAY": "Sa",
+  "APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
+  "APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
+  "ADD_AVAILABILITY": "ADD",
+  "CANCEL_KEY": "Cancel",
+  "OK_KEY": "Ok",
+  "CONFIRM_DELETE_AVAILABILITY": "There could be appointments booked for this service availability. Are you sure you want to proceed with deleting it?",
+  "CONFIRM_EDIT_SERVICE_MESSAGE_KEY": "There could be appointments booked against this service. Are you sure you want to save the changes?",
+  "APPOINTMENT_SERVICE_SAVE_SUCCESS": "Service saved successfully",
+  "APPOINTMENT_SAVE_SUCCESS": "Appointment saved successfully",
+  "NAVIGATION_CONFIRMATION_DIALOG_MESSAGE_KEY": "You may have unsaved changes, please choose an option",
+  "NAVIGATION_CONFIRMATION_OPTION_DONT_SAVE_KEY" : "Don't save",
+  "NAVIGATION_CONFIRMATION_OPTION_CANCEL_KEY" : "Stay on page",
+  "SAVE_CONFIRMATION_DIALOG_CONFLICT_KEY": "This patient already has an appointment booked at this time. Would you like to proceed or edit the timings?",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_SAVE_KEY" : "Proceed and save",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_CANCEL_KEY" : "Back to edit",
+  "DUPLICATE_SERVICE_NAME_ERROR_MESSAGE": "Service name already exists",
+  "TIME_SEQUENCE_ERROR_MESSAGE": "End time must be after Start time",
+  "OVERLAPPING_AVAILABILITY_ERROR_MESSAGE": "Seems like there is an overlap in the availability you are trying to add. Please correct it to proceed further",
+  "INVALID_SERVICE_FORM_ERROR_MESSAGE": "Please correct the values in the fields to proceed",
+  "INVALID_TIME_ERROR_MESSAGE": "Invalid start/end time. Expected format is hh:mm am/pm.",
+  "MESSAGE_DIALOG_OPTION_COPY": "Copy Error",
+  "MESSAGE_DIALOG_OPTION_OKAY": "Ok",
+  "ADD_SERVICE_APPOINTMENT_TYPE": "Add Service Appointment Type",
+  "ADD_NEW_TYPE": "Add new type",
+  "PLACEHOLDER_SERVICE_TYPE_NAME": "Service type name",
+  "ADD": "Add",
+  "DUPLICATE_SERVICE_APPOINTMENT_TYPE_ERROR_MESSAGE": "Service appointment type already exists.",
+  "APPOINTMENT_SERVICE_DELETE_SUCCESS_MESSAGE_KEY": "Service deleted successfully",
+  "APPOINTMENT_SERVICE_TYPE_DELETE_CONFIRMATION_DIALOG_MESSAGE_KEY": "There are appointments for this type in future, please cancel them before deleting this service appointment type.After deleting the service appt type, you will not be able to see any appts. for it",
+  "ADD_NEW_APPOINTMENT": "Add new appointment",
+  "APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Search",
+  "PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Name or ID",
+  "APPOINTMENT_CREATE_PATIENT_NAME": "Patient",
+  "APPOINTMENT_SERVICE": "Service",
+  "PLACEHOLDER_SERVICE": "Select a service",
+  "PLACEHOLDER_SERVICE_TYPE": "Select a service appointment type",
+  "PLACEHOLDER_CREATE_PROVIDER": "Select a provider",
+  "APPOINTMENT_DATE": "Date",
+  "APPOINTMENT_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_END_TIME_KEY": "End Time",
+  "PLACEHOLDER_APPOINTMENT_TIME_FORMAT": "Enter time as hh:mm am/pm",
+  "APPOINTMENT_CREATION_DATE_WARNING": "Date chosen is outside the availability of the service",
+  "APPOINTMENT_CREATION_START_TIME_WARNING": "Start time is outside the service available times",
+  "APPOINTMENT_CREATION_END_TIME_WARNING": "End time is outside the service available times",
+  "APPOINTMENT_CREATION_OUT_OF_RANGE_WARNING": "Selected time slots are outside the service available times",
+  "APPOINTMENT_CREATE_WALK_IN": "  Walk-in Appointment",
+  "APPOINTMENT_CREATE_NOTES": "Notes",
+  "PLACEHOLDER_CREATE_NOTES": "Enter appointment notes",
+  "APPOINTMENT_CREATE_SAVE": "Save",
+  "APPOINTMENT_CREATE_CANCEL": "Cancel",
+  "APPOINTMENT_CREATE_SLOT": "Slots",
+  "APPOINTMENT_CREATE_BOOKED": "Booked",
+  "APPOINTMENT_CREATE_AVAL": "Available",
+  "APPOINTMENT_CREATE_OUTOF": "out of",
+  "APPOINTMENT_PATIENT_ID": "Patient ID",
+  "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
+  "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
+  "APPOINTMENT_WALK_IN": "Walk In",
+  "APPOINTMENT_STATUS": "Status",
+  "APPOINTMENT_COMMENTS": "Comments",
+  "CHECK_IN_APPOINTMENT": "Check-in",
+  "COMPLETE_APPOINTMENT": "Complete",
+  "MISSED_APPOINTMENT": "Missed",
+  "EDIT_APPOINTMENT": "Edit",
+  "CANCEL_APPOINTMENT": "Cancel",
+  "CURRENT_DATE": "Ajourd'hui",
+  "TOTAL_KEY": "Total",
+  "MISSED_KEY": "missed",
+  "PLACEHOLDER_SELECT_PATIENT": "Select a patient",
+  "APPOINTMENT_SLOT": "Slot",
+  "EDIT_APPOINTMENT_KEY": "Edit Appointment",
+  "APPLY_FILTER_KEY": "Apply Filter",
+  "FILTER_KEY": "Filter",
+  "APPOINTMENT_STATUS_KEY": "Appointment status",
+  "APPOINTMENT_SERVICE_KEY": "Service",
+  "APPOINTMENT_SHOW_SELECTED_KEY": "Show selected",
+  "APPOINTMENT_ENTER_STATUS_NAME_KEY": "Enter status Name",
+  "RESET_KEY": "Reset",
+  "BACK_LABEL": "Back",
+  "PATIENT_LIST_VIEW_SEARCH_HEADER": "Rechercher",
+  "NO_APPOINTMENT_LIST_VIEW": "No appointments found",
+  "NO_APPOINTMENT_CALENDAR_VIEW": "No appointments found",
+  "SEARCH_KEY": "Rechercher ...",
+  "APPOINTMENT_ENTER_PROVIDER_NAME_KEY": "Enter provider name",
+  "NO_SPECIALITY_KEY": "No Speciality",
+  "PLACEHOLDER_SERVICE_TYPE_DURATION_MIN": "min",
+  "APPOINTMENT_STATUS_CHANGE_CONFIRM_MESSAGE": "Are you sure, you want to mark appointment as {{toStatus}}?",
+  "CHECK_IN_APPOINTMENT_TIME_VALIDATION": "Enter valid check in time.",
+  "YES_KEY": "Oui",
+  "NO_KEY": "Non",
+  "UNDO_CHECK_IN_APPOINTMENT": "Undo Check-in",
+  "APPOINTMENT_UNDO_CHECKIN_CONFIRM_MESSAGE": "Are you sure, you want to undo Check-in?",
+  "APPOINTMENT_ADDITIONAL_INFO": "Information supplementaire",
+  "APPOINTMENT_STATUS_CHANGE_SUCCESS_MESSAGE": "Successfully changed appointment status to {{toStatus}}"
+}
diff --git a/openmrs/i18n/appointments/locale_pt_BR.json b/openmrs/i18n/appointments/locale_pt_BR.json
new file mode 100644
index 000000000..13f3363f5
--- /dev/null
+++ b/openmrs/i18n/appointments/locale_pt_BR.json
@@ -0,0 +1,141 @@
+{
+  "APPOINTMENTS_MANAGE": "Manage Appointments",
+  "APPOINTMENTS_ADMIN": "Admin",
+  "APPOINTMENT_PROVIDER": "Provider",
+  "SUMMARY": "Summary",
+  "APPOINTMENT_LIST": "Appointments List",
+  "CALENDAR_VIEW": "Calendar",
+  "LIST_VIEW": "List view",
+  "NO_PROVIDER_COLUMN_KEY": "[No Provider]",
+  "SERVICES": "Services",
+  "APPOINTMENT_SERVICE_SAVE": "Save",
+  "APPOINTMENT_SERVICE_ADD_NEW": "Add New Service",
+  "APPOINTMENT_SERVICE_ACTION_KEY": "Action",
+  "APPOINTMENT_SERVICE_EDIT_ACTION": "Edit",
+  "APPOINTMENT_SERVICE_DELETE_ACTION": "Delete",
+  "APPOINTMENT_SERVICE_CANCEL_ACTION": "Cancel",
+  "APPOINTMENT_SERVICE_NAME_KEY": "Service Name",
+  "PLACEHOLDER_SERVICE_NAME": "Enter a service name",
+  "APPOINTMENT_SERVICE_DESCRIPTION_KEY": "Description",
+  "PLACEHOLDER_SERVICE_DESCRIPTION": "Enter description",
+  "APPOINTMENT_SERVICE_DURATION_KEY": "Duration",
+  "PLACEHOLDER_SERVICE_DURATION": "Mins",
+  "APPOINTMENT_SERVICE_MAX_LOAD_KEY": "Max Load",
+  "PLACEHOLDER_SERVICE_MAX_LOAD": "Appointments limit",
+  "APPOINTMENT_SERVICE_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_SPECIALITY_KEY": "Speciality",
+  "PLACEHOLDER_SERVICE_SPECIALITY": "Select a speciality",
+  "APPOINTMENT_SERVICE_LOCATION_KEY": "Location",
+  "APPOINTMENT_SERVICE_LABEL_COLOUR_KEY": "Label Colour",
+  "PLACEHOLDER_SERVICE_LOCATION": "Select a location",
+  "APPOINTMENT_SERVICE_TYPE": "Service App. Type",
+  "APPOINTMENT_SERVICE_TYPE_ADD_NEW": "Add Service Appointment Type",
+  "APPOINTMENT_SERVICE_AVAILABILITY": "Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_ADD_NEW": "Add Service Availability",
+  "APPOINTMENT_SERVICE_AVAILABILITY_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_END_TIME_KEY": "End Time",
+  "APPOINTMENT_SERVICE_AVAILABILITY_MAX_LOAD_KEY": "Max Load",
+  "SUNDAY": "Su",
+  "MONDAY": "Mo",
+  "TUESDAY": "Tu",
+  "WEDNESDAY": "We",
+  "THURSDAY": "Th",
+  "FRIDAY": "Fr",
+  "SATURDAY": "Sa",
+  "APPOINTMENT_SERVICE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service",
+  "APPOINTMENT_SERVICE_TYPE_CONFORMATION_POPUP_MESSAGE_FOR_DELETE": "Are you sure you want to delete service appointment type",
+  "ADD_AVAILABILITY": "ADD",
+  "CANCEL_KEY": "Cancel",
+  "OK_KEY": "Ok",
+  "CONFIRM_DELETE_AVAILABILITY": "There could be appointments booked for this service availability. Are you sure you want to proceed with deleting it?",
+  "CONFIRM_EDIT_SERVICE_MESSAGE_KEY": "There could be appointments booked against this service. Are you sure you want to save the changes?",
+  "APPOINTMENT_SERVICE_SAVE_SUCCESS": "Service saved successfully",
+  "APPOINTMENT_SAVE_SUCCESS": "Appointment saved successfully",
+  "NAVIGATION_CONFIRMATION_DIALOG_MESSAGE_KEY": "You may have unsaved changes, please choose an option",
+  "NAVIGATION_CONFIRMATION_OPTION_DONT_SAVE_KEY" : "Don't save",
+  "NAVIGATION_CONFIRMATION_OPTION_CANCEL_KEY" : "Stay on page",
+  "SAVE_CONFIRMATION_DIALOG_CONFLICT_KEY": "This patient already has an appointment booked at this time. Would you like to proceed or edit the timings?",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_SAVE_KEY" : "Proceed and save",
+  "SAVE_CONFIRMATION_OPTION_CONFLICT_CANCEL_KEY" : "Back to edit",
+  "DUPLICATE_SERVICE_NAME_ERROR_MESSAGE": "Service name already exists",
+  "TIME_SEQUENCE_ERROR_MESSAGE": "End time must be after Start time",
+  "OVERLAPPING_AVAILABILITY_ERROR_MESSAGE": "Seems like there is an overlap in the availability you are trying to add. Please correct it to proceed further",
+  "INVALID_SERVICE_FORM_ERROR_MESSAGE": "Please correct the values in the fields to proceed",
+  "INVALID_TIME_ERROR_MESSAGE": "Invalid start/end time. Expected format is hh:mm am/pm.",
+  "MESSAGE_DIALOG_OPTION_COPY": "Copy Error",
+  "MESSAGE_DIALOG_OPTION_OKAY": "Ok",
+  "ADD_SERVICE_APPOINTMENT_TYPE": "Add Service Appointment Type",
+  "ADD_NEW_TYPE": "Add new type",
+  "PLACEHOLDER_SERVICE_TYPE_NAME": "Service type name",
+  "ADD": "Add",
+  "DUPLICATE_SERVICE_APPOINTMENT_TYPE_ERROR_MESSAGE": "Service appointment type already exists.",
+  "APPOINTMENT_SERVICE_DELETE_SUCCESS_MESSAGE_KEY": "Service deleted successfully",
+  "APPOINTMENT_SERVICE_TYPE_DELETE_CONFIRMATION_DIALOG_MESSAGE_KEY": "There are appointments for this type in future, please cancel them before deleting this service appointment type.After deleting the service appt type, you will not be able to see any appts. for it",
+  "ADD_NEW_APPOINTMENT": "Add new appointment",
+  "APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Search",
+  "PLACEHOLDER_APPOINTMENT_CREATE_SEARCH_PATIENT": "Patient Name or ID",
+  "APPOINTMENT_CREATE_PATIENT_NAME": "Patient",
+  "APPOINTMENT_SERVICE": "Service",
+  "PLACEHOLDER_SERVICE": "Select a service",
+  "PLACEHOLDER_SERVICE_TYPE": "Select a service appointment type",
+  "PLACEHOLDER_CREATE_PROVIDER": "Select a provider",
+  "APPOINTMENT_DATE": "Date",
+  "APPOINTMENT_START_TIME_KEY": "Start Time",
+  "APPOINTMENT_END_TIME_KEY": "End Time",
+  "PLACEHOLDER_APPOINTMENT_TIME_FORMAT": "Enter time as hh:mm am/pm",
+  "APPOINTMENT_CREATION_DATE_WARNING": "Date chosen is outside the availability of the service",
+  "APPOINTMENT_CREATION_START_TIME_WARNING": "Start time is outside the service available times",
+  "APPOINTMENT_CREATION_END_TIME_WARNING": "End time is outside the service available times",
+  "APPOINTMENT_CREATION_OUT_OF_RANGE_WARNING": "Selected time slots are outside the service available times",
+  "APPOINTMENT_CREATE_WALK_IN": "  Walk-in Appointment",
+  "APPOINTMENT_CREATE_NOTES": "Notes",
+  "PLACEHOLDER_CREATE_NOTES": "Enter appointment notes",
+  "APPOINTMENT_CREATE_SAVE": "Save",
+  "APPOINTMENT_CREATE_CANCEL": "Cancel",
+  "APPOINTMENT_CREATE_SLOT": "Slots",
+  "APPOINTMENT_CREATE_BOOKED": "Booked",
+  "APPOINTMENT_CREATE_AVAL": "Available",
+  "APPOINTMENT_CREATE_OUTOF": "out of",
+  "APPOINTMENT_PATIENT_ID": "Patient ID",
+  "APPOINTMENT_PATIENT_NAME": "Patient Name",
+  "APPOINTMENT_CHECKIN_TIME_KEY": "Check in time",
+  "APPOINTMENT_SERVICE_TYPE_FULL": "Service Appointment Type",
+  "APPOINTMENT_WALK_IN": "Walk In",
+  "APPOINTMENT_STATUS": "Status",
+  "APPOINTMENT_COMMENTS": "Comments",
+  "CHECK_IN_APPOINTMENT": "Check-in",
+  "COMPLETE_APPOINTMENT": "Complete",
+  "MISSED_APPOINTMENT": "Missed",
+  "EDIT_APPOINTMENT": "Edit",
+  "CANCEL_APPOINTMENT": "Cancel",
+  "CURRENT_DATE": "Today",
+  "TOTAL_KEY": "Total",
+  "MISSED_KEY": "missed",
+  "PLACEHOLDER_SELECT_PATIENT": "Select a patient",
+  "APPOINTMENT_SLOT": "Slot",
+  "EDIT_APPOINTMENT_KEY": "Edit Appointment",
+  "APPLY_FILTER_KEY": "Apply Filter",
+  "FILTER_KEY": "Filter",
+  "APPOINTMENT_STATUS_KEY": "Appointment status",
+  "APPOINTMENT_SERVICE_KEY": "Service",
+  "APPOINTMENT_SHOW_SELECTED_KEY": "Show selected",
+  "APPOINTMENT_ENTER_STATUS_NAME_KEY": "Enter status Name",
+  "RESET_KEY": "Reset",
+  "BACK_LABEL": "Back",
+  "PATIENT_LIST_VIEW_SEARCH_HEADER": "Search",
+  "NO_APPOINTMENT_LIST_VIEW": "No appointments found",
+  "NO_APPOINTMENT_CALENDAR_VIEW": "No appointments found",
+  "SEARCH_KEY": "Search ...",
+  "APPOINTMENT_ENTER_PROVIDER_NAME_KEY": "Enter provider name",
+  "NO_SPECIALITY_KEY": "No Speciality",
+  "PLACEHOLDER_SERVICE_TYPE_DURATION_MIN": "min",
+  "APPOINTMENT_STATUS_CHANGE_CONFIRM_MESSAGE": "Are you sure, you want to mark appointment as {{toStatus}}?",
+  "CHECK_IN_APPOINTMENT_TIME_VALIDATION": "Enter valid check in time.",
+  "YES_KEY": "Yes",
+  "NO_KEY": "No",
+  "UNDO_CHECK_IN_APPOINTMENT": "Undo Check-in",
+  "APPOINTMENT_UNDO_CHECKIN_CONFIRM_MESSAGE": "Are you sure, you want to undo Check-in?",
+  "APPOINTMENT_ADDITIONAL_INFO": "Additional Info",
+  "APPOINTMENT_STATUS_CHANGE_SUCCESS_MESSAGE": "Successfully changed appointment status to {{toStatus}}"
+}
diff --git a/openmrs/i18n/clinical/locale_en.json b/openmrs/i18n/clinical/locale_en.json
index aeae74e36..e4fd7b1ae 100644
--- a/openmrs/i18n/clinical/locale_en.json
+++ b/openmrs/i18n/clinical/locale_en.json
@@ -23,6 +23,7 @@
   "DASHBOARD_TITLE_OBSTETRICS_KEY": "Obstetrics",
   "DASHBOARD_TITLE_NAVIGATION_LINKS_CONTROL_KEY": "Navigation Links Control",
   "DASHBOARD_TITLE_RADIOLOGY_ORDERS_KEY": "Radiology Orders",
+  "DASHBOARD_TITLE_PROCEDURE_ORDERS_KEY": "Procedure Orders",
   "DASHBOARD_TITLE_VITALS_KEY": "Vitals",
   "DASHBOARD_TITLE_PATIENT_INFORMATION_KEY": "Patient Information",
   "DASHBOARD_TITLE_BACTERIOLOGY_RESULTS_KEY":"Bacteriology Results",
diff --git a/openmrs/i18n/orders/locale_en.json b/openmrs/i18n/orders/locale_en.json
index 47fd6517d..d134212b1 100644
--- a/openmrs/i18n/orders/locale_en.json
+++ b/openmrs/i18n/orders/locale_en.json
@@ -1,3 +1,3 @@
 {
-  "MODULE_LABEL_RADIOLOGY_ORDERS_KEY": "Radiology Orders"
+  "MODULE_LABEL_RADIOLOGY_ORDERS_KEY": "Orders"
 }
\ No newline at end of file