vendor proximity has been implemented, UI now prompts for location. do pip install geopy
Merge branch 'master' of https://github.com/rpanjwani/beLocal into proximity-filtering
Fixed an issue where if the user didn't allow location, no vendors would show up
Products are now display sorted by proximity if user allows location on browser
Merge branch 'master' of https://github.com/rpanjwani/beLocal into proximity-filtering
removed debug comments/prints that were redundant
removed obsolete code on models.py
Fixed an issue where no products would show up if there was no location allowed
Merge branch 'master' into proximity-filtering

Conflicts:
	src/client/app/scripts/controllers/main.js
	src/client/app/scripts/services/stateservice.js
	src/server/be_local_server/views.py
Fixed error when user denies location.
Added timeout

Now, if the user fails to accept/deny the location request, we will
still return products after 5 seconds.
Added error message for signing in on main page
Fixed vendor profile picture grabbing on sign up.
Merge pull request #28 from rpanjwani/proximity-filtering

This is a fairly substantial change, as Sam's branch was 36 commits behind master at the time of merge, and several of his changes directly conflicted with Jyoti's Likes branch. I believe everything here has been merged correctly though. Proximity works in the cases where users accept, deny and ignore the "Use Location" request, and liking has been tested to work for products.
Merge branch 'master' of github.com:rpanjwani/beLocal into vendor-likes

* 'master' of github.com:rpanjwani/beLocal:
  Fixed vendor profile picture grabbing on sign up.
  Added error message for signing in on main page
  Added timeout
  Fixed error when user denies location.
  Fixed an issue where no products would show up if there was no location allowed
  removed obsolete code on models.py
  removed debug comments/prints that were redundant
  Products are now display sorted by proximity if user allows location on browser
  Fixed an issue where if the user didn't allow location, no vendors would show up
  vendor proximity has been implemented, UI now prompts for location. do pip install geopy

Conflicts:
	src/client/app/scripts/controllers/main.js
	src/client/app/scripts/services/stateservice.js
	src/server/be_local_server/serializers.py
	src/server/be_local_server/views.py