Android commit for real
Merge branch 'master' of https://github.com/paulisloud/SquareUp