Fixing liquibase upgrade error for: TRUNK-4334
TRUNK-4323 Retired location attributes should not be shown when viewing
location hierarchy; they should be marked as retired in the tree view
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
TRUNK-4030: locking mechanism for form_id
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
Merge pull request #874 from lluismf/TRUNK-4323

TRUNK-4323 Retired location attributes should not be shown when viewing location hierarchy; they should be marked as retired in the tree view
Doing some maven formatting for: Retired location attributes should not
be shown when viewing location hierarchy; they should be marked as
retired in the tree view - TRUNK-4323
added modifications to existing pull request 717 TRUNK-3293
Merge pull request #876 from rpuzdrowski/TRUNK-4030

TRUNK-4030: locking mechanism for form_id
Merge pull request #882 from harsha89/TRUNK-3293

added modifications to existing pull request 717 TRUNK-3293
All the messages

Hopefully only changed the single lines

Fixxed the couple issues

More confilicts.....

Fixed merge issues
Merge pull request #886 from Fahv/TRUNK-2119-Non-Format

TRUNK-2119
Merging last part for: Add error checking to relationship start/end
dates on patient dashboard - TRUNK-3293 author:harsha89
Merging: User secret answer should be required if the question is set -
TRUNK-3779 author:shubh
Doing some file formatting
Merge pull request #1 from openmrs/master

Test