fixes view partners
Merge branch 'develop' of github.com:kaize/castle into feature/partner_url-54

Conflicts:
	app/views/layouts/web/shared/_partners.html.haml
fixes partners
Merge branch 'feature/partner_url-54' into staging

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/web/shared/_partners.html.haml