Changed some school/department specific code in the home page
Merge branch 'develop' into feature/website
Created a basic plugin for the Mauris website
Merge branch 'master' into feature/website

Conflicts:
	app/Config/bootstrap.php
	app/View/Layouts/default.ctp

Change-Id: Ib2f624cb6285b8358993482fbcb6359a20f929b5
The layout's home button now points to the website home controller

Change-Id: I4f6440327f46790ae77d5aba77bad56243ce0a01
Enable the schedule plugin only when not on the main website

Change-Id: Ic1617749648de00e12f2944b8f0b0a059a5b6ee1
Improved the Website home page by including some text

Change-Id: I790e57490005c3c53558426313f53363693b84be
Fixed the Website loading by using HTTP_HOST instead of SERVER_NAME

Change-Id: I44fb69e31ed9cedde590a35f835ce29cc4c7df89
Fixed the code contributing link on the website home

Change-Id: Ia65d0b1e449824e0f3fd699c4f4a276b8a17e637
Merge branch 'master' into feature/website

Conflicts:
	app/Config/bootstrap.php

Change-Id: If027f77e3df20ed175d77a8c0889c8fb91ba4c45
Created a local config file to store environment specific settings

Change-Id: I70dcf003003d48ed4fca6238e3f51def52768ce7
Added Gravatar hash support to the Gravatar helper

Change-Id: I0f23550ee64097a3e4d53d31f49629fe28469a3c
Created a controller and views to show information about contributing

Change-Id: I58c6a5487ed2a8d21e9e468424f52d7a18db006f
Merge branch 'master' into feature/website

Conflicts:
	app/Config/bootstrap.php
	app/View/Layouts/default.ctp

Change-Id: I40f9cc562b721383cb90483273da34937633249d
Fixed the menu's when on the website plugin

Change-Id: I4c95f6dfbc86acef69bf229505156d63161f6b68
Replaced the CVO-Technologies URL with the actual website URL

Change-Id: Ia99f00e7d07d9cf78ed68ba7bb0142e6d6b4097e
Improved the code on the view layout

Change-Id: Icc8fb428b836ba389ae31e601070200220470447
Merge branch 'feature/website'