removed breadcrumb, added base header and footer logic
Merge remote-tracking branch 'origin/master'

Conflicts:
	portal-theme/src/main/webapp/templates/portal_normal.vm