Merge branch 'master' of heroku.com:quito-backend
Merge branch 'master' of heroku.com:quito-backend
show foursquare in nested article location
Merge branch 'master' of github.com:Betahackers/quito-backend
edit user without password
merge origin