Fixed vendor card phone behaviour
removed proximity filtering (temporarily?) in change for randomized listing of products
Merge branch 'master' into non-facebook-auth

Conflicts:
	src/client/app/scripts/controllers/main.js
	src/client/app/scripts/directives/vendorCard.html