Merged 4.0-stable
Merge branch 'master' of github.com:malmostad/global_assets

Conflicts:
	Gemfile.lock
	app/assets/javascripts/google_analytics.js.coffee.erb
	app/assets/javascripts/masthead_content.js
	vendor/malmo_shared_assets/.bower.json
	vendor/malmo_shared_assets/stylesheets/internal/variables.scss