Merge branch 'responsive-plugin' into distribution-responsive

Conflicts:
	Gemfile
	Gemfile.lock
	app/helpers/colorbox_helper.rb
	app/views/layouts/_javascript.html.erb
	plugins/shopping_cart/views/cart.html.erb
	plugins/solr/lib/solr_plugin.rb
	plugins/solr/vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
	plugins/solr/vendor/plugins/acts_as_solr_reloaded/solr/solr/conf/schema.xml
	public/javascripts/application.js