Merge branch 'feature-grids' into develop

Conflicts:
	portal/core/templates/core/base.html
	portal/core/templates/core/portal.html