Changed Namepsace
new changes Merge branch 'master' of https://github.com/Zigito/osemtek-base

Conflicts:
	src/Guavabrava/SiteBundle/Controller/SiteController.php
	src/Guavabrava/SiteBundle/Resources/config/routing.yml
	src/Guavabrava/SiteBundle/Resources/views/Site/index.html.twig