DrugOrderValidator should allow a drug order with either a concept or
drug - TRUNK-3008
Conflicts:
	api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
Patient search don't work on IE8 - TRUNK-3817
Removed loading of module specific log4j configuration files
TRUNK-3867: getPatientIdentifiers(String identifier, List<PatientIdentifierType> patientIdentifierTypes, List<Location> locations, List<Patient> patients, Boolean isPreferred) does not restrict by location
backport to 1.8.x
Attempting to save an alert without text should display a more user friendly error message - TRUNK-2975

added some changes

Cleaned up code in AlertValidator
Retired concepts aren't showed as retired when listed as set members -
TRUNK-3840
update all of these types of extension point links to use c:url so
that we are consistent - TRUNK-3770
Back porting to 1.8.x: Handle complex observations (ED) in ORUR01Handler
- TRUNK-3887
Back porting to 1.8.x: Using initialization wizard with db on separate 
machine - TRUNK-2765
Revert "Retired concepts aren't showed as retired when listed as set members -"

This reverts commit 7cbf165379e569e0f8c6a471c6607b60a52066f9.
Revert "update all of these types of extension point links to use c:url so"

This reverts commit 83b204419e991c3abcb07b69b57c078f63e26045.
Updated obs did not get displayed correctly on dashboard - TRUNK-3609
Fixed @since value - TRUNK-3609
TRUNK-3949: Do not commit with validation errors