Changed delete plan button
Fixed some problems with link URL encodings in activity feed
refactored SocialActivityKey classes
Fixes to editFocusArea to reflect multiple ontology space children
Fixed bug in the link generation of comment activities
Fixed discussion title in activity feed for proposal discussion + wording mistakes
Merge branch 'refs/heads/master' into april_tasks

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