fixed service builder
service builder
Merge branch 'IntegratedProposals' of https://github.com/jintrone/XCoLab into IntegratedProposals

Conflicts:
	services/plansProposalsFacade/plansProposalsFacade-portlet-service/src/main/java/com/ext/portlet/service/ContestLocalService.java
	services/plansProposalsFacade/plansProposalsFacade-portlet-service/src/main/java/com/ext/portlet/service/ContestLocalServiceClp.java
	services/plansProposalsFacade/plansProposalsFacade-portlet-service/src/main/java/com/ext/portlet/service/ContestLocalServiceUtil.java
	services/plansProposalsFacade/plansProposalsFacade-portlet-service/src/main/java/com/ext/portlet/service/ContestLocalServiceWrapper.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/resources/service.properties
sb fix