Rolling back
Merge branch 'master' of https://github.com/bhahm/PingU-Android