add google analytics code
Merge branch 'master' into integration

Conflicts:
	app/views/base.html.twig