Revert "New version-website"

This reverts commit fe953ce0e4be96bd813f2fb9b5c5c4ca4fdd1378.
Commented out broken contact us form.
Delete .DS_Store
Delete .sugar.css.swp
Merge branch 'website-redesign'

Conflicts:
	app/assets/images/catalog-small.png
	app/assets/images/logo-feduro.png
	app/assets/images/manager.png
	app/assets/images/multiplatform.png
	app/assets/images/orders.png
	app/assets/javascripts/spices.js
	app/assets/stylesheets/sugar.css
	app/views/pages/_navbar_btns.html.haml
	app/views/pages/catalog.html.haml
	app/views/pages/contact.html.haml
	app/views/pages/index.html.haml
	app/views/pages/manager.html.haml
	app/views/pages/orders.html.haml
Merge branch 'master' into website-redesign