fixed sorting for proposal listing in contests
Merge branch 'xcolab_refactoring' of https://github.com/jintrone/XCoLab into xcolab_refactoring

Conflicts:
	portlets/proposals-portlet/src/main/java/org/xcolab/portlets/proposals/view/ContestProposalsController.java