Merge branch 'master' of https://github.com/Zigito/osemtek-base

Conflicts:
	src/Palmeration/SiteBundle/Controller/SiteController.php
Merge branch 'master' of https://github.com/Zigito/osemtek-base

Conflicts:
	src/Palmeration/SiteBundle/Controller/SiteController.php
Merge branch 'master' of https://github.com/Zigito/osemtek-base
Merge branch 'master' of https://github.com/Zigito/osemtek-base

Conflicts:
	src/Palmeration/SiteBundle/Controller/SiteController.php
Merge branch 'master' of https://github.com/Zigito/osemtek-base

Conflicts:
	src/Palmeration/SiteBundle/Controller/SiteController.php
Merge remote-tracking branch 'origin/master'