Starting to make layout changes.
Merge branch 'master' of https://github.com/Kombicorp/marePortal

Conflicts:
	api/controllers/SiteController.js