Merge branch 'master' into cleanup

Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml

app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee

@@ -0,0 +1,13 @@
+Darkswarm.directive "ofnRegistrationLimitModal", (Navigation, $modal, Loading) ->
+  restrict: 'A'
+  link: (scope, elem, attr)->
+    scope.modalInstance = $modal.open
+      templateUrl: 'registration/limit_reached.html'
+      windowClass: "login-modal large"
+      backdrop: 'static'
+
+    scope.modalInstance.result.then scope.close, scope.close
+
+    scope.close = ->
+      Loading.message = "Taking you back to the home page"
+      Navigation.go "/"

app/assets/javascripts/darkswarm/filters/show_profiles.js.coffee

@@ -4,4 +4,4 @@ Darkswarm.filter 'showProfiles', ()->
     show_profiles ?= true
 
     enterprises.filter (enterprise)=>
-      show_profiles or not enterprise.is_profile
+      show_profiles or enterprise.has_shopfront

app/assets/javascripts/templates/registration/limit_reached.html.haml

@@ -0,0 +1,15 @@
+%div
+  .header.center
+    %h2 Oh no!
+    %h4 You have reached the limit!
+  .row
+    .small-12.medium-3.large-2.columns.text-right.hide-for-small-only
+      %img{:src => "/assets/potatoes.png"}
+    .small-12.medium-9.large-10.columns
+      %p
+        You have reached the limit for the number of enterprises you are allowed to own on the
+        %strong Open Food Network.
+  .row
+    .small-12.columns
+      %hr
+      %input.button.primary{ type: "button", value: "Return to the homepage", ng: { click: "close()" } }