Merge remote-tracking branch 'origin/1.9.x' into TRUNK_2136

Conflicts:
	.gitignore
	api/pom.xml
	api/src/main/java/org/openmrs/BaseOpenmrsObject.java
	api/src/main/java/org/openmrs/Drug.java
	api/src/main/java/org/openmrs/Encounter.java
	api/src/main/java/org/openmrs/Obs.java
	api/src/main/java/org/openmrs/Order.java
	api/src/main/java/org/openmrs/OrderType.java
	api/src/main/java/org/openmrs/TestOrder.java
	api/src/main/java/org/openmrs/annotation/DisableHandlers.java
	api/src/main/java/org/openmrs/aop/AuthorizationAdvice.java
	api/src/main/java/org/openmrs/aop/LoggingAdvice.java
	api/src/main/java/org/openmrs/aop/RequiredDataAdvice.java
	api/src/main/java/org/openmrs/api/AdministrationService.java
	api/src/main/java/org/openmrs/api/ConceptService.java
	api/src/main/java/org/openmrs/api/EncounterService.java
	api/src/main/java/org/openmrs/api/FormService.java
	api/src/main/java/org/openmrs/api/LocationService.java
	api/src/main/java/org/openmrs/api/OrderService.java
	api/src/main/java/org/openmrs/api/PatientService.java
	api/src/main/java/org/openmrs/api/PatientSetService.java
	api/src/main/java/org/openmrs/api/ProviderService.java
	api/src/main/java/org/openmrs/api/UserService.java
	api/src/main/java/org/openmrs/api/context/Daemon.java
	api/src/main/java/org/openmrs/api/db/PatientDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernateConceptDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernateLocationDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/HibernatePersonDAO.java
	api/src/main/java/org/openmrs/api/db/hibernate/PatientSearchCriteria.java
	api/src/main/java/org/openmrs/api/impl/AdministrationServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/ConceptServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/DatatypeServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/EncounterServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/FormServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/LocationServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/OrderServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/PatientServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/PersonServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/ProviderServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/UserServiceImpl.java
	api/src/main/java/org/openmrs/api/impl/VisitServiceImpl.java
	api/src/main/java/org/openmrs/hl7/handler/ORUR01Handler.java
	api/src/main/java/org/openmrs/migration/MigrationHelper.java
	api/src/main/java/org/openmrs/module/ModuleConstants.java
	api/src/main/java/org/openmrs/module/ModuleFactory.java
	api/src/main/java/org/openmrs/module/UpdateFileParser.java
	api/src/main/java/org/openmrs/notification/Note.java
	api/src/main/java/org/openmrs/util/DatabaseUpdater.java
	api/src/main/java/org/openmrs/util/OpenmrsClassLoader.java
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	api/src/main/java/org/openmrs/util/OpenmrsUtil.java
	api/src/main/java/org/openmrs/util/PrivilegeConstants.java
	api/src/main/java/org/openmrs/util/databasechange/SourceMySqldiffFile.java
	api/src/main/java/org/openmrs/validator/ConceptReferenceTermValidator.java
	api/src/main/java/org/openmrs/validator/ConceptValidator.java
	api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
	api/src/main/java/org/openmrs/validator/EncounterRoleValidator.java
	api/src/main/java/org/openmrs/validator/PatientProgramValidator.java
	api/src/main/java/org/openmrs/validator/PersonAttributeTypeValidator.java
	api/src/main/java/org/openmrs/validator/ProgramValidator.java
	api/src/main/java/org/openmrs/validator/UserValidator.java
	api/src/main/resources/hibernate.cfg.xml
	api/src/main/resources/liquibase-update-to-latest.xml
	api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSetDerived.hbm.xml
	api/src/main/resources/org/openmrs/api/db/hibernate/Encounter.hbm.xml
	api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
	api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
	api/src/test/java/org/openmrs/EncounterTest.java
	api/src/test/java/org/openmrs/ObsTest.java
	api/src/test/java/org/openmrs/PatientProgramTest.java
	api/src/test/java/org/openmrs/ProviderTest.java
	api/src/test/java/org/openmrs/aop/AuthorizationAdviceTest.java
	api/src/test/java/org/openmrs/aop/RequiredDataAdviceTest.java
	api/src/test/java/org/openmrs/api/AdministrationServiceTest.java
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
	api/src/test/java/org/openmrs/api/EncounterServiceTest.java
	api/src/test/java/org/openmrs/api/OrderServiceTest.java
	api/src/test/java/org/openmrs/api/PatientServiceTest.java
	api/src/test/java/org/openmrs/api/PersonServiceTest.java
	api/src/test/java/org/openmrs/api/ProgramWorkflowServiceTest.java
	api/src/test/java/org/openmrs/api/ProviderServiceTest.java
	api/src/test/java/org/openmrs/api/UserServiceTest.java
	api/src/test/java/org/openmrs/api/VisitServiceTest.java
	api/src/test/java/org/openmrs/api/context/DaemonTest.java
	api/src/test/java/org/openmrs/api/db/ConceptDAOTest.java
	api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
	api/src/test/java/org/openmrs/api/db/UserDAOTest.java
	api/src/test/java/org/openmrs/hl7/handler/ORUR01HandlerTest.java
	api/src/test/java/org/openmrs/module/ModuleUtilTest.java
	api/src/test/java/org/openmrs/scheduler/SchedulerServiceTest.java
	api/src/test/java/org/openmrs/test/BaseContextSensitiveTest.java
	api/src/test/java/org/openmrs/validator/ConceptValidatorTest.java
	api/src/test/java/org/openmrs/validator/PatientIdentifierValidatorTest.java
	api/src/test/java/org/openmrs/validator/PersonAttributeTypeValidatorTest.java
	api/src/test/java/org/openmrs/validator/PersonNameValidatorTest.java
	api/src/test/java/org/openmrs/validator/ProgramValidatorTest.java
	api/src/test/java/org/openmrs/validator/ProviderValidatorTest.java
	api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-numerics.xml
	api/src/test/resources/org/openmrs/api/include/ConceptServiceTest-words.xml
	api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
	api/src/test/resources/org/openmrs/api/include/OrderServiceTest-deleteObsThatReference.xml
	api/src/test/resources/org/openmrs/api/include/OrderServiceTest-drugOrdersList.xml
	api/src/test/resources/org/openmrs/include/initialInMemoryTestDataSet.xml
	api/src/test/resources/org/openmrs/include/standardTestDataset.xml
	api/src/test/resources/org/openmrs/module/include/test1-1.0-SNAPSHOT.omod
	api/src/test/resources/org/openmrs/module/include/test1-2.0-SNAPSHOT.omod
	api/src/test/resources/org/openmrs/module/include/test2-1.0-SNAPSHOT.omod
	api/src/test/resources/org/openmrs/module/include/test3-1.0-SNAPSHOT.omod
	api/src/test/resources/org/openmrs/module/include/test3-2.0-SNAPSHOT.omod
	api/src/test/resources/org/openmrs/reporting/include/PatientFilterTest.xml
	pom.xml
	test/pom.xml
	tools/pom.xml
	web/pom.xml
	web/src/main/java/org/openmrs/module/web/WebModuleUtil.java
	web/src/main/java/org/openmrs/web/Listener.java
	web/src/main/java/org/openmrs/web/WebDaemon.java
	web/src/main/java/org/openmrs/web/controller/ConceptFormController.java
	web/src/main/java/org/openmrs/web/controller/concept/ConceptProposalFormController.java
	web/src/main/java/org/openmrs/web/controller/visit/VisitListController.java
	web/src/main/java/org/openmrs/web/dwr/DWROrderService.java
	web/src/main/java/org/openmrs/web/dwr/DWRPatientService.java
	web/src/main/java/org/openmrs/web/dwr/DWRProviderService.java
	web/src/main/java/org/openmrs/web/filter/initialization/InitializationFilter.java
	web/src/main/java/org/openmrs/web/taglib/FormatTag.java
	web/src/main/java/org/openmrs/web/taglib/RequireTag.java
	web/src/main/resources/openmrs-servlet.xml
	web/src/main/resources/org/openmrs/web/filter/initialization/installmethod.vm
	web/src/test/java/org/openmrs/module/web/WebModuleUtilTest.java
	web/src/test/java/org/openmrs/scheduler/web/controller/SchedulerFormControllerTest.java
	web/src/test/java/org/openmrs/web/WebUtilTest.java
	web/src/test/java/org/openmrs/web/controller/ConceptFormControllerTest.java
	web/src/test/java/org/openmrs/web/controller/concept/ConceptProposalFormControllerTest.java
	web/src/test/java/org/openmrs/web/controller/user/RoleFormControllerTest.java
	web/src/test/java/org/openmrs/web/dwr/DWRPatientServiceTest.java
	web/src/test/java/org/openmrs/web/taglib/FormatTagTest.java
	webapp/pom.xml
	webapp/src/main/resources/liquibase-demo-data.zip
	webapp/src/main/webapp/WEB-INF/messages.properties
	webapp/src/main/webapp/WEB-INF/messages_fa.properties
	webapp/src/main/webapp/WEB-INF/messages_hi.properties
	webapp/src/main/webapp/WEB-INF/messages_pt.properties
	webapp/src/main/webapp/WEB-INF/taglibs/openmrs.tld
	webapp/src/main/webapp/WEB-INF/template/gutter.jsp
	webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDatatypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptDrugForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptProposalForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptReferenceTermForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSetDerivedForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptSourceList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/conceptStopWordForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/concepts/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterRoleForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/encounters/encounterTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/encounters/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/fieldTypeList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/formEditForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/formList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/formResources.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/forms/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7InArchiveMigration.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/hl7/hl7SourceForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/hl7/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/index.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/locations/addressTemplate.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/locations/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/locations/locationAttributeType.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/locations/locationForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/locations/locationTagEdit.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/maintenance/globalPropsForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/maintenance/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/modules/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/modules/moduleList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/observations/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/observations/obsForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderDrugForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderListByPatient.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/orders/orderTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/include/editPatientIdentifier.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/mergePatientsForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/patientForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/patientIdentifierTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/patients/shortPatientForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/addPerson.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/include/editPersonInfo.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/include/showPersonInfo.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/personAttributeTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/person/personForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/programs/conversionForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/programs/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/programs/programForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/programs/programList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/programs/workflowForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/provider/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/provider/providerAttributeTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/provider/providerForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/scheduler/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/scheduler/schedulerList.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/alertForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/changePasswordForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/privilegeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/roleForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/users/userForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/visits/configureVisits.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/visits/localHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/visits/visitAttributeTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/visits/visitForm.jsp
	webapp/src/main/webapp/WEB-INF/view/admin/visits/visitTypeForm.jsp
	webapp/src/main/webapp/WEB-INF/view/dictionary/concept.jsp
	webapp/src/main/webapp/WEB-INF/view/dictionary/conceptForm.jsp
	webapp/src/main/webapp/WEB-INF/view/optionsForm.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/addPersonForm.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/addressLayout.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/cohort.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/customMostRecentObs.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/findPatient.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/nameLayout.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientDemographics.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientEncounters.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientGraphs.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientHeader.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientOverview.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientPrograms.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientRegimen.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/patientVisits.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/personRelationships.jsp
	webapp/src/main/webapp/WEB-INF/view/portlets/welcome.jsp
	webapp/src/main/webapp/WEB-INF/view/scripts/calendar/calendar.js
	webapp/src/main/webapp/WEB-INF/view/scripts/drugOrder.js.withjstl
	webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/jquery-ui-datepicker-i18n.js
	webapp/src/main/webapp/WEB-INF/view/scripts/jquery-ui/js/openmrsSearch.js
	webapp/src/main/webapp/WEB-INF/view/scripts/jquery/autocomplete/OpenmrsAutoComplete.js
	webapp/src/main/webapp/WEB-INF/view/scripts/openmrsmessages.js.withjstl
	webapp/src/main/webapp/WEB-INF/view/scripts/timepicker/timepicker.js
	webapp/src/main/webapp/WEB-INF/web.xml
	webapp/src/main/webapp/dictionary/conceptForm.js
	webapp/src/main/webapp/errorhandler.jsp
	webapp/src/main/webapp/openmrs.css
	webapp/src/main/webapp/openmrs.js