TRUNK-4348: OpenmrsClassLoader chooses wrong ModuleClassLoader when one module name is a substring of another module name
added blank line to re-trigger build since bamboo logins are down
Remove Logic Module as a core module - TRUNK-3169
added openmrs core english to chinese localization property file
Merge pull request #881 from harsha89/TRUNK-4321

added openmrs core english to chinese localization property file
TRUNK-4361: When merging patients, addresses from Non-Preferred Patients should not be set to preferrred
TRUNK-4036 Retiring a Location also retires the location tag