Merge changes in spree/core on _google_analytics partial back in

Fixes #34

Conflicts:

	app/views/spree/shared/_google_analytics.html.erb
Merge branch 'master' of git://github.com/spree/spree-multi-domain into spree-master
Bump to version 2.0.0.beta of spree
bundle update - spree_core version updated
Add locale