Dev Sync (22)

Development sync - radius search, gelocation improvements, bugfixes