NOJIRA update uPortal master to use WebProxyPortlet v 2.0.0-M2
NOJIRA - remove obsolete channel definition files.
Merge branch 'NOJIRA-update-webproxyportlet-to-2.0.0-M2' of https://github.com/mgillian/uPortal

Conflicts:
	pom.xml