locations added
location fix 1
Fix conflicts
Merge pull request #3 from cesium/joaof-dev

Accepted.