portal modify
portal modify
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/decorators/portal.ftl
	src/main/webapp/cmsres/portal/css/sub.css