TRUNK-3840: Refactoring code to display retired set member

https://issues.openmrs.org/browse/TRUNK-3840

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
set1 has a higher weight of 2.0, so i assumed it should come before set2 that has a lower weight of 1.0 since they both have uniretired concepts