Merge pull request #66 from RealFilling/hotfix-geolocationssl

Hotfix geolocationssl
Merge pull request #81 from RealFilling/feat-layoutredesign

Feat layoutredesign
CRLF
Merge branch 'master' of https://github.com/RealFilling/farmshares

Conflicts:
	public/stylesheets/app/buttons.styl
	public/stylesheets/app/fonts.styl
	public/stylesheets/app/footer.styl
	public/stylesheets/app/navbar.styl
	public/stylesheets/app/newsletter.styl
	public/stylesheets/app/ribbon.styl
	public/stylesheets/app/slider.styl
	public/stylesheets/app/stitches.styl
Revert "Merge pull request #81 from RealFilling/feat-layoutredesign"

This reverts commit dd0de9b565d924e902783116f1bd86a330b62cd2, reversing
changes made to dfc3df3b95571ad1fa3ea694657d3f374728ad56.

Conflicts:

	public/stylesheets/app/buttons.styl
	public/stylesheets/app/fonts.styl
	public/stylesheets/app/footer.styl
	public/stylesheets/app/navbar.styl
	public/stylesheets/app/newsletter.styl
	public/stylesheets/app/ribbon.styl
	public/stylesheets/app/slider.styl
	public/stylesheets/app/stitches.styl
Delete start-mocha-win.bat
Delete start-mocha
Delete start-debug-win.bat
Delete start-debug
Line Endings Nightmare
Merge branch 'master' into staging