* a
Merge branch 'develop' of github.com:SaltySoft/gravitysite into develop

Conflicts:
	App/Views/Pages/home.html.twig