include articles in locations
merged origin
Merge branch 'master' of github.com:Betahackers/quito-backend
make locations also findable by foursquare id