Doing some file formatting
Fix failing tests in EncounterServiceTest - TRUNK-4545
TRUNK-4492 - Removed column "Tribe" from demo-data.
TRUNK-3840: Refactoring code to display retired set member

Refactored concept.jsp; removed repeated code.
Add code to ConceptSet.java to factor in retired concepts while sorting
Added unit test for new behavior

Updated concept.jsp view and ConceptFormController

Factored in null weights

Changed ConceptSet compateTo method to use OpenmrsUtil's compateWithNullAsLowest
Follow up - TRUNK-3840
Fix for coded concept broken with Most Recent Observation on dashboard TRUNK-4131

Follow up to clean unit tests - TRUNK-4131
TRUNK-4429: Add check that default locale is amongst allowed locales list