added locations to json api
Merge branch 'admin_screens' of github.com:joshblour/quito-backend into admin_screens

Conflicts:
	db/schema.rb