Move GA code to head
Merge branch 'develop'
Merge branch 'master' into custom

Conflicts:
	app/views/layouts/application.html.erb