Delete .merge_file_a06880
Delete .merge_file_a12124
Delete .merge_file_a14028
Delete .merge_file_a16644
Delete .merge_file_a21548
Delete .merge_file_a17092
Polished UI
Polished Android UI
Polished Android UI
Merge branch 'master' of https://github.com/lawlessc/room-proximity
Polished Android UI