Resolved conflicts manually

code refactoring for new facet markup

Conflicts:
	WebContent/resources/css/searchPage.css
	WebContent/resources/js/searchAndFacet/diseaseFacetWidget.js
	WebContent/resources/js/searchAndFacet/geneFacetWidget.js
	WebContent/resources/js/searchAndFacet/maFacetWidget.js
	WebContent/resources/js/searchAndFacet/mpFacetWidget.js
	WebContent/resources/js/searchAndFacet/pipelineFacetWidget.js
	WebContent/resources/js/utils/tools.js