Encounter autocomplete should filter results by patient - TRUNK-3231

Encounter autocomplete should filter results by patient - TRUNK-3231
Follow up to move the @Transactional annotation to the serviceImpl -
TRUNK-3231
update all of these types of extension point links to use c:url so that
we are consistent - TRUNK-3770
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
First cut UI changes to ask user for subject, name, email & what were you doing when the error occured.
Modified to support passing all params to post user entered details about the error (via a javascript function). Now description is pre-fixed before the stacktrace, and summary is user inputted, rather than taking exception toString
TRUNK-3875: Upgrade xstream to 1.4.3
(cherry picked from commit 0758208dd59b4b81d7b4da83d6752b6de4d8fc20)
TRUNK-3658: FormService.saveFormResouce doesn't effectively replace
existing resources
TRUNK-3344: Show the first provider fields automatically without
clicking "Add Provider" when Adding a New Encounter
Added a ValidationException class

Added @since annotation - TRUNK-2897

Updated the class level javadocs - TRUNK-2897
Add unit test that ensures that an executing task doesn't get rescheduled

TRUNK-2695 implementing changes suggested in code review

TRUNK-2695 removed comments related to debugging
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
Fix error message for visit attribute types - TRUNK-3230
UserContext should store locationId instead of the Location object - TRUNK-3883

added some changes

applying auto commit changes

Fixed userContext.getLocation to return null when locationId is null -
TRUNK-3883

Added @since and javadocs for getters and setters of
userContext.locationId - TRUNK-3883
Resolving conflicts
applying auto format changes
Concept form and ConceptProposal form should use the same list of
locales - TRUNK-3828
handles empty short names and void the old ones instead of saving the empty ones
TRUNK-3892: providerDAO.getProvidersByPerson(person, false) returns only retired providers, when it should return only *non-retired* providers
Move the whole pattern for updateConceptIndexes into the scheduler - TRUNK-3263

Fixed TimerSchedulerServiceImpl to call scheduleTask instead of
rescheduleTask if there is no current task instance - TRUNK-3263

Add @since to SchedulerService.scheduleIfNotRunning - TRUNK-3263