cesium/socios-api — pull request #3 by Xcode23 (2014-12-08 19:40:11+00:00)
Title: Joaof dev

Adds location to users. Merge conflicts fixed.