Implemented admin button to transfer proposal support2vote

+ Messaging service for users
Refactored ActivityUtil class
Changed activity email notification format and daily digest
Merge branch 'refs/heads/april_tasks' into contest_support2vote

Conflicts:
	portlets/plansadmin-portlet/src/main/webapp/xhtml/editContest.xhtml
	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/ProposalLocalServiceClp.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ContestLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ProposalLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ProposalVoteLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/impl/ContestLocalServiceImpl.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/impl/ProposalLocalServiceImpl.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/resources/service.properties
Merge branch 'refs/heads/april_tasks' into contest_support2vote

Conflicts:
	portlets/plansadmin-portlet/src/main/webapp/xhtml/editContest.xhtml
	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/ProposalLocalServiceClp.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ContestLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ProposalLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/base/ProposalVoteLocalServiceClpInvoker.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/impl/ContestLocalServiceImpl.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/java/com/ext/portlet/service/impl/ProposalLocalServiceImpl.java
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/resources/service.properties
wording change
small refactoring change
Merge branch 'refs/heads/refactoring' into april_tasks
Fix for getVoteCount method in service layer
Fixed problem with bio editor in registration view
Merge branch 'refs/heads/master' into april_tasks
Repositioned active/prior contests in outline view
Changed supports2vote message text and added social media sharing
Fixed wrong port in email notification links
minor robustness fix