Added location data and updated API
Merge branch 'master' of https://github.com/bah-interactivemedia/ReInventNASA2014