test change
Merge branch 'dev'
remove locate button, fix android bug focusing on address input
Merge branch 'dev'