Homepage footer & Our story
Merge branch 'master' of github.com:TrangHo/onoff

Conflicts:
	app/assets/stylesheets/store/homepage.css
	app/views/spree/home/index.html.erb