Merge
Merge branch 'master' of github.com:infocorp/intercursos-sonata-sandbox

Conflicts:
	src/Infocorp/Bundle/IntercursosBundle/Resources/views/Default/index.html.twig