Add google analytics
Merge remote branch 'github/master' into rails4

Conflicts:
	app/views/layouts/application.html.erb
add stubs for specs