When you open the edit page for a scheduled task, if you leave the page
without saving, the repeat interval unit gets changed to seconds no
matter what it was previously - TRUNK-3759
TRUNK-3344: Show the first provider fields automatically without
clicking "Add Provider" when Adding a New Encounter
Add SerializableComplexObsHandler interface for form processing methods
- TRUNK-3886
Revert "Retired concepts aren't showed as retired when listed as set members - TRUNK-3840"

This reverts commit 573b613f1c6a592c72e1042b5ad7998c9c55370f.
TRUNK-3551 Merging Person and Address.  Cherry-picking Tom Ryan's commit and fixing some failing unit tests
TRUNK-3551 Merging Person and Address.  Remove references to commons lang3 from import
Merge pull request #227 from mseaton/master

TRUNK-3351: Merging persons incorrectly handles addresses and names
Program state change displays wrong date in IE8 TRUNK-3482
Patient Dashboard - Allergy shows as year 3912 in place of 2012 TRUNK-3561
Applying auto format changes
Merge pull request #144 from wluyima/TRUNK-3759

When you open the edit page for a scheduled task, if you leave the page without saving, the repeat interval unit gets changed to seconds no matter what it was previously - TRUNK-3759
Adding some changes for: Add Unit test for
HibernatePatientDAO.getAllPatientIdentifierTypes(boolean)
Foreign key constraint violation on ConceptWord when removing a concept
name - TRUNK-3690
added isDaemonUser() at Daemon class and tested it at DaemonTest class, junit test passed

Fixed the @shoulds and test method names - TRUNK-3424
applying auto format changes
Responding to review comments for: Add WebUtil.getContextPath() -
TRUNK-3615
Adding missing if for: Add regex validation to PersonNameValidator -
TRUNK-2616
Minor additions for: getProviders(String query, Integer start, Integer
length, Map<ProviderAttributeType, Object> attributes) should allow the
option to include or not include retired providers - TRUNK-3170
TRUNK-3204 : Add JUnit test for getting by null/true/false isPreferred in HibernatePatientDAO.getPatientIdentifiers

TRUNK-3204: Add JUnit test for getting by null/true/false isPreferred in HibernatePatientDAO.getPatientIdentifiers

TRUNK-3204: Add JUnit test for getting by null/true/false isPreferred in HibernatePatientDAO.getPatientIdentifiers

TRUNK-3204: Add JUnit test for getting by null/true/false isPreferred in HibernatePatientDAO.getPatientIdentifiers
Manage Providers spinning status wheel turns before entering search
terms - TRUNK-3339

Resolved last conflict - TRUNK--3339

Removed @Transactional annotation from ProviderService method -
TRUNK-3339

Fixed the @since version to 1.9.4 - TRUNK-3339