Modified satellite: Identify captcha in satellite
Satellite modified: Identification of captcha in satellite
Merge branch 'develop' of https://github.com/applepi-icpc/project-watermetre into develop

Bug repaired
Repairing tapoo