Added geocoding to UIUC
Merge branch 'uiuc' into develop