Android Spot class
Merge branch 'master' of https://github.com/putsi/hairy-bugfixes