Fixed issue in the countProposalInPhase query
Moved proposalCount code to service layer, refactoring
Fixed comment count issue in contest list
Ignore contest discussion comments for total comment count in contest list
Added a sponsor link to a contest sponsor logo
Merge branch 'master' into proposal_count_fix
Merge branch 'sponsor_link' into proposal_count_fix

Conflicts:
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/resources/service.properties
Merge branch 'master' of https://github.com/CCI-MIT/XCoLab
fixed service builder conflicts

Conflicts:
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ProposalLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/resources/service.properties
Fixed comment count of contest in contests-portlet
Fixed missing contestIndexer (NPE)