update
Merge remote-tracking branch 'origin/landing1.1' into new_content

Conflicts:
	app/stylesheets/partials/_320grid.sass
	app/stylesheets/partials/_960grid.sass
	app/views/layouts/_footer.haml
	app/views/layouts/_header.haml
	public/images/assets-sdc6b3bb5f2.png
	public/images/assets/icon_publish.png
	public/images/assets/icon_publish_hover.png
	public/images/assets/icon_question.png
	public/images/assets/icon_question_hover.png
	public/images/assets/icon_submit.png
	public/images/assets/icon_submit_hover.png
	public/images/assets/icon_subscribe.png
	public/images/assets/icon_subscribe_hover.png
	public/images/assets/icon_think.png
	public/images/assets/icon_think_hover.png
	public/images/assets/mobile_icon_publish.png
	public/images/assets/mobile_icon_publish_hover.png
	public/images/assets/mobile_icon_question.png
	public/images/assets/mobile_icon_question_hover.png
	public/images/assets/mobile_icon_submit.png
	public/images/assets/mobile_icon_submit_hover.png
	public/images/assets/mobile_icon_subscribe.png
	public/images/assets/mobile_icon_subscribe_hover.png
	public/images/assets/mobile_icon_think.png
	public/images/assets/mobile_icon_think_hover.png
	public/javascripts/960.js
	public/stylesheets/application.css
Merge branch 'new_content' of https://github.com/piermariacosina/localactors into new_content

Conflicts:
	app/stylesheets/partials/_320grid.sass
	public/stylesheets/application.css