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
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
Retired concepts aren't showed as retired when listed as set members - TRUNK-3840

Use retired class instead of strike tag