Merge branch 'responsive-plugin' into cirandas-rails3

Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/helpers/colorbox_helper.rb
	app/helpers/layout_helper.rb
	app/helpers/tinymce_helper.rb
	app/views/account/index_anonymous.html.erb
	app/views/account/login.html.erb
	app/views/account/logout_popup.html.erb
	app/views/cms/edit.html.erb
	app/views/cms/why_categorize.html.erb
	app/views/home/index.html.erb
	app/views/layouts/_javascript.html.erb
	app/views/layouts/_user.html.erb
	app/views/manage_products/_edit_description.html.erb
	app/views/profile/join.html.erb
	app/views/profile/leave.html.erb
	app/views/profile_themes/add_css.html.erb
	app/views/shared/user_menu.html.erb
	plugins/shopping_cart/views/cart.html.erb
	public/designs/themes/base/style.css
	public/javascripts/application.js
	public/javascripts/tinymce/js/tinymce/skins/lightgray/img/object.gif
	public/stylesheets/application.css
	public/stylesheets/colorbox.css
	test/functional/cms_controller_test.rb