Outline view for contests
Merge remote-tracking branch 'origin/master' into master_integration

Conflicts:
	services/plansProposalsFacade/plansProposalsFacade-portlet/src/main/resources/service.properties